diff options
394 files changed, 4336 insertions, 5824 deletions
diff --git a/CMakeL10n.txt b/CMakeL10n.txt index 970d8fda..f7601df2 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -9,7 +9,11 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) ##### include our cmake modules ################# diff --git a/CMakeLists.txt b/CMakeLists.txt index 262d3482..72407428 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,12 @@ # ################################################# -cmake_minimum_required( VERSION 3.5 ) + +##### set project version ######################## + +include( TDEVersion ) +cmake_minimum_required( VERSION ${TDE_CMAKE_MINIMUM_VERSION} ) +tde_set_project_version( ) ##### general package setup ##################### @@ -35,11 +40,6 @@ include( CheckLibraryExists ) include( TDEMacros ) -##### set version number ######################## - -tde_set_project_version( ) - - ##### setup install paths ####################### include( TDESetupPaths ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index ce929a8b..09eb9b90 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -19,7 +19,6 @@ test_big_endian(WORDS_BIGENDIAN) tde_setup_largefiles( ) find_package( TQt ) -find_package( TQtQUI ) find_package( TDE ) @@ -28,16 +27,3 @@ find_package( TDE ) if( WITH_GCC_VISIBILITY ) tde_setup_gcc_visibility( ) endif( ) - - -##### check for libdl ########################### - -set( DL_LIBRARIES dl ) -check_library_exists( ${DL_LIBRARIES} dlopen /lib HAVE_LIBDL ) -if( NOT HAVE_LIBDL ) - unset( DL_LIBRARIES ) - check_function_exists( dlopen HAVE_DLOPEN ) - if( HAVE_DLOPEN ) - set( HAVE_LIBDL 1 ) - endif( HAVE_DLOPEN ) -endif( NOT HAVE_LIBDL ) diff --git a/admin b/admin -Subproject 3bdc9fd55ff86f033cc1ffab9178d8453fa1ab2 +Subproject 4185112a621d8c5bc88984b117f434c9560e2cc diff --git a/cervisia/addremovedlg.cpp b/cervisia/addremovedlg.cpp index 240d3b2a..a49eac60 100644 --- a/cervisia/addremovedlg.cpp +++ b/cervisia/addremovedlg.cpp @@ -59,7 +59,7 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, TQWidget* parent, const char TQBoxLayout *warningLayout = new TQHBoxLayout; TQLabel *warningIcon = new TQLabel(mainWidget); - TDEIconLoader *loader = kapp->iconLoader(); + TDEIconLoader *loader = tdeApp->iconLoader(); warningIcon->setPixmap(loader->loadIcon("messagebox_warning", TDEIcon::NoGroup, TDEIcon::SizeMedium, TDEIcon::DefaultState, 0, true)); diff --git a/cervisia/addrepositorydlg.cpp b/cervisia/addrepositorydlg.cpp index 576b43f4..a31c497f 100644 --- a/cervisia/addrepositorydlg.cpp +++ b/cervisia/addrepositorydlg.cpp @@ -81,10 +81,10 @@ AddRepositoryDialog::AddRepositoryDialog(TDEConfig& cfg, const TQString& repo, "server"), mainWidget); layout->addWidget(m_retrieveCvsignoreFile); - connect( repo_edit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(repoChanged()) ); - connect( m_useDifferentCompression, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(compressionToggled(bool)) ); + connect( repo_edit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(repoChanged()) ); + connect( m_useDifferentCompression, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(compressionToggled(bool)) ); repoChanged(); TQSize size = configDialogSize(partConfig, "AddRepositoryDialog"); diff --git a/cervisia/annotateview.cpp b/cervisia/annotateview.cpp index 3649b73d..9390ca2a 100644 --- a/cervisia/annotateview.cpp +++ b/cervisia/annotateview.cpp @@ -159,8 +159,8 @@ AnnotateView::AnnotateView(TDEConfig &cfg, TQWidget *parent, const char *name) ToolTip* toolTip = new ToolTip(viewport()); - connect(toolTip, TQT_SIGNAL(queryToolTip(const TQPoint&, TQRect&, TQString&)), - this, TQT_SLOT(slotQueryToolTip(const TQPoint&, TQRect&, TQString&))); + connect(toolTip, TQ_SIGNAL(queryToolTip(const TQPoint&, TQRect&, TQString&)), + this, TQ_SLOT(slotQueryToolTip(const TQPoint&, TQRect&, TQString&))); TDEConfigGroupSaver cs(&cfg, "LookAndFeel"); setFont(cfg.readFontEntry("AnnotateFont")); diff --git a/cervisia/cervisiapart.cpp b/cervisia/cervisiapart.cpp index 63fb5976..7973ad5b 100644 --- a/cervisia/cervisiapart.cpp +++ b/cervisia/cervisiapart.cpp @@ -29,10 +29,10 @@ #include <tdeapplication.h> #include <tdefiledialog.h> #include <kinputdialog.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdelocale.h> #include <knotifyclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kpropertiesdialog.h> #include <kstatusbar.h> #include <kstdaction.h> @@ -138,10 +138,10 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName, update = new UpdateView(*config(), splitter); update->setFocusPolicy( TQWidget::StrongFocus ); update->setFocus(); - 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)) ); + connect( update, TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQ_SLOT(popupRequested(TDEListView*, TQListViewItem*, const TQPoint&)) ); + connect( update, TQ_SIGNAL(fileOpened(TQString)), + this, TQ_SLOT(openFile(TQString)) ); protocol = new ProtocolView(appId, splitter); protocol->setFocusPolicy( TQWidget::StrongFocus ); @@ -157,12 +157,12 @@ CervisiaPart::CervisiaPart( TQWidget *parentWidget, const char *widgetName, { setupActions(); readSettings(); - connect( update, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( updateActions() ) ); + connect( update, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( updateActions() ) ); } setXMLFile( "cervisiaui.rc" ); - TQTimer::singleShot(0, this, TQT_SLOT(slotSetupStatusBar())); + TQTimer::singleShot(0, this, TQ_SLOT(slotSetupStatusBar())); } CervisiaPart::~CervisiaPart() @@ -233,81 +233,81 @@ void CervisiaPart::setupActions() // File Menu // action = new TDEAction( i18n("O&pen Sandbox..."), "document-open", CTRL+Key_O, - this, TQT_SLOT( slotOpenSandbox() ), + this, TQ_SLOT( slotOpenSandbox() ), actionCollection(), "file_open" ); hint = i18n("Opens a CVS working folder in the main window"); action->setToolTip( hint ); action->setWhatsThis( hint ); recent = new TDERecentFilesAction( i18n("Recent Sandboxes"), 0, - this, TQT_SLOT( openURL( const KURL & ) ), + this, TQ_SLOT( openURL( const KURL & ) ), actionCollection(), "file_open_recent" ); action = new TDEAction( i18n("&Insert ChangeLog Entry..."), 0, - this, TQT_SLOT( slotChangeLog() ), + this, TQ_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 TDEAction( i18n("&Update"), "vcs_update", CTRL+Key_U, - this, TQT_SLOT( slotUpdate() ), + this, TQ_SLOT( slotUpdate() ), actionCollection(), "file_update" ); hint = i18n("Updates (cvs update) the selected files and folders"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Status"), "vcs_status", Key_F5, - this, TQT_SLOT( slotStatus() ), + this, TQ_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 TDEAction( i18n("&Edit"), 0, - this, TQT_SLOT( slotOpen() ), + this, TQ_SLOT( slotOpen() ), actionCollection(), "file_edit" ); hint = i18n("Opens the marked file for editing"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("Reso&lve..."), 0, - this, TQT_SLOT( slotResolve() ), + this, TQ_SLOT( slotResolve() ), actionCollection(), "file_resolve" ); hint = i18n("Opens the resolve dialog with the selected file"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Commit..."), "vcs_commit", Key_NumberSign, - this, TQT_SLOT( slotCommit() ), + this, TQ_SLOT( slotCommit() ), actionCollection(), "file_commit" ); hint = i18n("Commits the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Add to Repository..."), "vcs_add", Key_Insert, - this, TQT_SLOT( slotAdd() ), + this, TQ_SLOT( slotAdd() ), actionCollection(), "file_add" ); hint = i18n("Adds (cvs add) the selected files to the repository"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("Add &Binary..."), 0, - this, TQT_SLOT( slotAddBinary() ), + this, TQ_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 TDEAction( i18n("&Remove From Repository..."), "vcs_remove", Key_Delete, - this, TQT_SLOT( slotRemove() ), + this, TQ_SLOT( slotRemove() ), actionCollection(), "file_remove" ); hint = i18n("Removes (cvs remove) the selected files from the repository"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("Rever&t"), 0, - this, TQT_SLOT( slotRevert() ), + this, TQ_SLOT( slotRevert() ), actionCollection(), "file_revert_local_changes" ); hint = i18n("Reverts (cvs update -C) the selected files (only cvs 1.11)"); action->setToolTip( hint ); @@ -315,14 +315,14 @@ void CervisiaPart::setupActions() // context menu only action = new TDEAction( i18n("&Properties"), 0, - this, TQT_SLOT( slotFileProperties() ), + this, TQ_SLOT( slotFileProperties() ), actionCollection(), "file_properties" ); // // View Menu // action = new TDEAction( i18n("Stop"), "process-stop", Key_Escape, - TQT_TQOBJECT(protocol), TQT_SLOT(cancelJob()), + protocol, TQ_SLOT(cancelJob()), actionCollection(), "stop_job" ); action->setEnabled( false ); hint = i18n("Stops any running sub-processes"); @@ -331,7 +331,7 @@ void CervisiaPart::setupActions() action = new TDEAction( i18n("Browse &Log..."), CTRL+Key_L, - this, TQT_SLOT(slotBrowseLog()), + this, TQ_SLOT(slotBrowseLog()), actionCollection(), "view_log" ); hint = i18n("Shows the revision tree of the selected file"); action->setToolTip( hint ); @@ -339,46 +339,46 @@ void CervisiaPart::setupActions() #if 0 action = new TDEAction( i18n("Browse Multi-File Log..."), 0, - this, TQT_SLOT(slotBrowseMultiLog()), + this, TQ_SLOT(slotBrowseMultiLog()), actionCollection() ); #endif action = new TDEAction( i18n("&Annotate..."), CTRL+Key_A, - this, TQT_SLOT(slotAnnotate()), + this, TQ_SLOT(slotAnnotate()), actionCollection(), "view_annotate" ); hint = i18n("Shows a blame-annotated view of the selected file"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Difference to Repository (BASE)..."), "vcs_diff", CTRL+Key_D, - this, TQT_SLOT(slotDiffBase()), + this, TQ_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 TDEAction( i18n("Difference to Repository (HEAD)..."), "vcs_diff", CTRL+Key_H, - this, TQT_SLOT(slotDiffHead()), + this, TQ_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 TDEAction( i18n("Last &Change..."), 0, - this, TQT_SLOT(slotLastChange()), + this, TQ_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 TDEAction( i18n("&History..."), 0, - this, TQT_SLOT(slotHistory()), + this, TQ_SLOT(slotHistory()), actionCollection(), "view_history" ); hint = i18n("Shows the CVS history as reported by the server"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Unfold File Tree"), 0, - this , TQT_SLOT(slotUnfoldTree()), + this , TQ_SLOT(slotUnfoldTree()), actionCollection(), "view_unfold_tree" ); hint = i18n("Opens all branches of the file tree"); @@ -386,7 +386,7 @@ void CervisiaPart::setupActions() action->setWhatsThis( hint ); action = new TDEAction( i18n("&Fold File Tree"), 0, - this, TQT_SLOT(slotFoldTree()), + this, TQ_SLOT(slotFoldTree()), actionCollection(), "view_fold_tree" ); hint = i18n("Closes all branches of the file tree"); action->setToolTip( hint ); @@ -396,98 +396,98 @@ void CervisiaPart::setupActions() // Advanced Menu // action = new TDEAction( i18n("&Tag/Branch..."), 0, - this, TQT_SLOT(slotCreateTag()), + this, TQ_SLOT(slotCreateTag()), actionCollection(), "create_tag" ); hint = i18n("Creates a tag or branch for the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Delete Tag..."), 0, - this, TQT_SLOT(slotDeleteTag()), + this, TQ_SLOT(slotDeleteTag()), actionCollection(), "delete_tag" ); hint = i18n("Deletes a tag from the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Update to Tag/Date..."), 0, - this, TQT_SLOT(slotUpdateToTag()), + this, TQ_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 TDEAction( i18n("Update to &HEAD"), 0, - this, TQT_SLOT(slotUpdateToHead()), + this, TQ_SLOT(slotUpdateToHead()), actionCollection(), "update_to_head" ); hint = i18n("Updates the selected files to the HEAD revision"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Merge..."), 0, - this, TQT_SLOT(slotMerge()), + this, TQ_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 TDEAction( i18n("&Add Watch..."), 0, - this, TQT_SLOT(slotAddWatch()), + this, TQ_SLOT(slotAddWatch()), actionCollection(), "add_watch" ); hint = i18n("Adds a watch for the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Remove Watch..."), 0, - this, TQT_SLOT(slotRemoveWatch()), + this, TQ_SLOT(slotRemoveWatch()), actionCollection(), "remove_watch" ); hint = i18n("Removes a watch from the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("Show &Watchers"), 0, - this, TQT_SLOT(slotShowWatchers()), + this, TQ_SLOT(slotShowWatchers()), actionCollection(), "show_watchers" ); hint = i18n("Shows the watchers of the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("Ed&it Files"), 0, - this, TQT_SLOT(slotEdit()), + this, TQ_SLOT(slotEdit()), actionCollection(), "edit_files" ); hint = i18n("Edits (cvs edit) the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("U&nedit Files"), 0, - this, TQT_SLOT(slotUnedit()), + this, TQ_SLOT(slotUnedit()), actionCollection(), "unedit_files" ); hint = i18n("Unedits (cvs unedit) the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("Show &Editors"), 0, - this, TQT_SLOT(slotShowEditors()), + this, TQ_SLOT(slotShowEditors()), actionCollection(), "show_editors" ); hint = i18n("Shows the editors of the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Lock Files"), 0, - this, TQT_SLOT(slotLock()), + this, TQ_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 TDEAction( i18n("Unl&ock Files"), 0, - this, TQT_SLOT(slotUnlock()), + this, TQ_SLOT(slotUnlock()), actionCollection(), "unlock_files" ); hint = i18n("Unlocks the selected files"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("Create &Patch Against Repository..."), 0, - this, TQT_SLOT(slotMakePatch()), + this, TQ_SLOT(slotMakePatch()), actionCollection(), "make_patch" ); hint = i18n("Creates a patch from the modifications in your sandbox"); action->setToolTip( hint ); @@ -497,25 +497,25 @@ void CervisiaPart::setupActions() // Repository Menu // action = new TDEAction( i18n("&Create..."), 0, - this, TQT_SLOT(slotCreateRepository()), + this, TQ_SLOT(slotCreateRepository()), actionCollection(), "repository_create" ); action = new TDEAction( i18n("&Checkout..."), 0, - this, TQT_SLOT(slotCheckout()), + this, TQ_SLOT(slotCheckout()), actionCollection(), "repository_checkout" ); hint = i18n("Allows you to checkout a module from a repository"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Import..."), 0, - this, TQT_SLOT(slotImport()), + this, TQ_SLOT(slotImport()), actionCollection(), "repository_import" ); hint = i18n("Allows you to import a module into a repository"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("&Repositories..."), 0, - this, TQT_SLOT(slotRepositories()), + this, TQ_SLOT(slotRepositories()), actionCollection(), "show_repositories" ); hint = i18n("Configures a list of repositories you regularly use"); action->setToolTip( hint ); @@ -525,7 +525,7 @@ void CervisiaPart::setupActions() // Settings menu // TDEToggleAction* toggaction = new TDEToggleAction( i18n("Hide All &Files"), 0, - this, TQT_SLOT(slotHideFiles()), + this, TQ_SLOT(slotHideFiles()), actionCollection(), "settings_hide_files" ); toggaction->setCheckedState(i18n("Show All &Files")); hint = i18n("Determines whether only folders are shown"); @@ -533,7 +533,7 @@ void CervisiaPart::setupActions() toggaction->setWhatsThis( hint ); toggaction = new TDEToggleAction( i18n("Hide Unmodified Files"), 0, - this, TQT_SLOT(slotHideUpToDate()), + this, TQ_SLOT(slotHideUpToDate()), actionCollection(), "settings_hide_uptodate" ); toggaction->setCheckedState(i18n("Show Unmodified Files")); hint = i18n("Determines whether files with status up-to-date or " @@ -542,7 +542,7 @@ void CervisiaPart::setupActions() toggaction->setWhatsThis( hint ); toggaction = new TDEToggleAction( i18n("Hide Removed Files"), 0, - this, TQT_SLOT(slotHideRemoved()), + this, TQ_SLOT(slotHideRemoved()), actionCollection(), "settings_hide_removed" ); toggaction->setCheckedState(i18n("Show Removed Files")); hint = i18n("Determines whether removed files are hidden"); @@ -550,7 +550,7 @@ void CervisiaPart::setupActions() toggaction->setWhatsThis( hint ); toggaction = new TDEToggleAction( i18n("Hide Non-CVS Files"), 0, - this, TQT_SLOT(slotHideNotInCVS()), + this, TQ_SLOT(slotHideNotInCVS()), actionCollection(), "settings_hide_notincvs" ); toggaction->setCheckedState(i18n("Show Non-CVS Files")); hint = i18n("Determines whether files not in CVS are hidden"); @@ -558,7 +558,7 @@ void CervisiaPart::setupActions() toggaction->setWhatsThis( hint ); toggaction = new TDEToggleAction( i18n("Hide Empty Folders"), 0, - this, TQT_SLOT(slotHideEmptyDirectories()), + this, TQ_SLOT(slotHideEmptyDirectories()), actionCollection(), "settings_hide_empty_directories" ); toggaction->setCheckedState(i18n("Show Empty Folders")); hint = i18n("Determines whether folders without visible entries are hidden"); @@ -566,42 +566,42 @@ void CervisiaPart::setupActions() toggaction->setWhatsThis( hint ); action = new TDEToggleAction( i18n("Create &Folders on Update"), 0, - this, TQT_SLOT(slotCreateDirs()), + this, TQ_SLOT(slotCreateDirs()), actionCollection(), "settings_create_dirs" ); hint = i18n("Determines whether updates create folders"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEToggleAction( i18n("&Prune Empty Folders on Update"), 0, - this, TQT_SLOT(slotPruneDirs()), + this, TQ_SLOT(slotPruneDirs()), actionCollection(), "settings_prune_dirs" ); hint = i18n("Determines whether updates remove empty folders"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEToggleAction( i18n("&Update Recursively"), 0, - this, TQT_SLOT(slotUpdateRecursive()), + this, TQ_SLOT(slotUpdateRecursive()), actionCollection(), "settings_update_recursively" ); hint = i18n("Determines whether updates are recursive"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEToggleAction( i18n("C&ommit && Remove Recursively"), 0, - this, TQT_SLOT(slotCommitRecursive()), + this, TQ_SLOT(slotCommitRecursive()), actionCollection(), "settings_commit_recursively" ); hint = i18n("Determines whether commits and removes are recursive"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEToggleAction( i18n("Do cvs &edit Automatically When Necessary"), 0, - this, TQT_SLOT(slotDoCVSEdit()), + this, TQ_SLOT(slotDoCVSEdit()), actionCollection(), "settings_do_cvs_edit" ); hint = i18n("Determines whether automatic cvs editing is active"); action->setToolTip( hint ); action->setWhatsThis( hint ); action = new TDEAction( i18n("Configure Cervisia..."), "configure", 0, - this, TQT_SLOT(slotConfigure()), + this, TQ_SLOT(slotConfigure()), actionCollection(), "configure_cervisia" ); hint = i18n("Allows you to configure the Cervisia KPart"); action->setToolTip( hint ); @@ -610,11 +610,11 @@ void CervisiaPart::setupActions() // // Help Menu // - action = KStdAction::help( this, TQT_SLOT(slotHelp()), + action = KStdAction::help( this, TQ_SLOT(slotHelp()), actionCollection() ); action = new TDEAction( i18n("CVS &Manual"), 0, - this, TQT_SLOT(slotCVSInfo()), + this, TQ_SLOT(slotCVSInfo()), actionCollection(), "help_cvs_manual" ); hint = i18n("Opens the help browser with the CVS documentation"); action->setToolTip( hint ); @@ -624,11 +624,11 @@ void CervisiaPart::setupActions() // Folder context menu // toggaction = new TDEToggleAction( i18n("Unfold Folder"), 0, - this, TQT_SLOT( slotUnfoldFolder() ), + this, TQ_SLOT( slotUnfoldFolder() ), actionCollection(), "unfold_folder" ); toggaction->setCheckedState(i18n("Fold Folder")); - //action = KStdAction::aboutApp( this, TQT_SLOT(aboutCervisia()), + //action = KStdAction::aboutApp( this, TQ_SLOT(aboutCervisia()), // actionCollection(), "help_about_cervisia" ); } @@ -881,9 +881,9 @@ void CervisiaPart::slotStatus() if( protocol->startJob(true) ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(receivedLine(TQString)), update, TQT_SLOT(processUpdateLine(TQString)) ); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), update, TQT_SLOT(finishJob(bool, int)) ); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(receivedLine(TQString)), update, TQ_SLOT(processUpdateLine(TQString)) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), update, TQ_SLOT(finishJob(bool, int)) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), this, TQ_SLOT(slotJobFinished()) ); } } @@ -992,8 +992,8 @@ void CervisiaPart::slotCommit() { m_jobType = Commit; showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), update, TQT_SLOT(finishJob(bool, int)) ); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), update, TQ_SLOT(finishJob(bool, int)) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), this, TQ_SLOT(slotJobFinished()) ); } } } @@ -1060,9 +1060,9 @@ void CervisiaPart::updateSandbox(const TQString &extraopt) if( protocol->startJob(true) ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(receivedLine(TQString)), update, TQT_SLOT(processUpdateLine(TQString)) ); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), update, TQT_SLOT(finishJob(bool, int)) ); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(receivedLine(TQString)), update, TQ_SLOT(processUpdateLine(TQString)) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), update, TQ_SLOT(finishJob(bool, int)) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), this, TQ_SLOT(slotJobFinished()) ); } } @@ -1108,10 +1108,10 @@ void CervisiaPart::addOrRemove(AddRemoveDialog::ActionType action) if (protocol->startJob()) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - update, TQT_SLOT(finishJob(bool, int)) ); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + update, TQ_SLOT(finishJob(bool, int)) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + this, TQ_SLOT(slotJobFinished()) ); } } } @@ -1211,8 +1211,8 @@ void CervisiaPart::addOrRemoveWatch(WatchDialog::ActionType action) if( protocol->startJob() ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + this, TQ_SLOT(slotJobFinished()) ); } } } @@ -1247,8 +1247,8 @@ void CervisiaPart::slotEdit() if( protocol->startJob() ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + this, TQ_SLOT(slotJobFinished()) ); } } @@ -1267,8 +1267,8 @@ void CervisiaPart::slotUnedit() if( protocol->startJob() ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + this, TQ_SLOT(slotJobFinished()) ); } } @@ -1287,8 +1287,8 @@ void CervisiaPart::slotLock() if( protocol->startJob() ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + this, TQ_SLOT(slotJobFinished()) ); } } @@ -1307,8 +1307,8 @@ void CervisiaPart::slotUnlock() if( protocol->startJob() ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + this, TQ_SLOT(slotJobFinished()) ); } } @@ -1327,8 +1327,8 @@ void CervisiaPart::slotShowEditors() if( protocol->startJob() ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + this, TQ_SLOT(slotJobFinished()) ); } } @@ -1394,8 +1394,8 @@ void CervisiaPart::slotImport() if( protocol->startJob() ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + this, TQ_SLOT(slotJobFinished()) ); } } @@ -1414,8 +1414,8 @@ void CervisiaPart::slotCreateRepository() if( protocol->startJob() ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + this, TQ_SLOT(slotJobFinished()) ); } } @@ -1437,8 +1437,8 @@ void CervisiaPart::slotCheckout() if( protocol->startJob() ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + this, TQ_SLOT(slotJobFinished()) ); } } @@ -1487,8 +1487,8 @@ void CervisiaPart::createOrDeleteTag(TagDialog::ActionType action) if( protocol->startJob() ) { showJobStart(cmdline); - connect( protocol, TQT_SIGNAL(jobFinished(bool, int)), - this, TQT_SLOT(slotJobFinished()) ); + connect( protocol, TQ_SIGNAL(jobFinished(bool, int)), + this, TQ_SLOT(slotJobFinished()) ); } } } @@ -1687,8 +1687,8 @@ void CervisiaPart::slotJobFinished() emit setStatusBarText( i18n("Done") ); updateActions(); - disconnect( protocol, TQT_SIGNAL(receivedLine(TQString)), - update, TQT_SLOT(processUpdateLine(TQString)) ); + disconnect( protocol, TQ_SIGNAL(receivedLine(TQString)), + update, TQ_SLOT(processUpdateLine(TQString)) ); if( m_jobType == Commit ) { diff --git a/cervisia/cervisiashell.cpp b/cervisia/cervisiashell.cpp index 27fdb2dd..2c4bed62 100644 --- a/cervisia/cervisiashell.cpp +++ b/cervisia/cervisiashell.cpp @@ -43,7 +43,7 @@ CervisiaShell::CervisiaShell( const char *name ) KLibFactory* factory = KLibLoader::self()->factory("libcervisiapart"); if( factory ) { - m_part = static_cast<KParts::ReadOnlyPart*>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadOnlyPart*>(factory->create(this, "cervisiaview", "KParts::ReadOnlyPart")); if( m_part ) setCentralWidget(m_part->widget()); @@ -52,7 +52,7 @@ CervisiaShell::CervisiaShell( const char *name ) { KMessageBox::detailedError(this, i18n("The Cervisia library could not be loaded."), KLibLoader::self()->lastErrorMessage()); - kapp->quit(); + tdeApp->quit(); return; } @@ -62,15 +62,15 @@ CervisiaShell::CervisiaShell( const char *name ) // Magic needed for status texts // actionCollection()->setHighlightingEnabled(true); - connect( actionCollection(), TQT_SIGNAL( actionStatusText(const TQString &) ), - statusBar(), TQT_SLOT( message(const TQString &) ) ); - connect( actionCollection(), TQT_SIGNAL( clearStatusText() ), - statusBar(), TQT_SLOT( clear() ) ); + connect( actionCollection(), TQ_SIGNAL( actionStatusText(const TQString &) ), + statusBar(), TQ_SLOT( message(const TQString &) ) ); + connect( actionCollection(), TQ_SIGNAL( clearStatusText() ), + statusBar(), TQ_SLOT( clear() ) ); m_part->actionCollection()->setHighlightingEnabled(true); - connect( m_part->actionCollection(), TQT_SIGNAL( actionStatusText(const TQString &) ), - statusBar(), TQT_SLOT( message(const TQString &) ) ); - connect( m_part->actionCollection(), TQT_SIGNAL( clearStatusText() ), - statusBar(), TQT_SLOT( clear() ) ); + connect( m_part->actionCollection(), TQ_SIGNAL( actionStatusText(const TQString &) ), + statusBar(), TQ_SLOT( message(const TQString &) ) ); + connect( m_part->actionCollection(), TQ_SIGNAL( clearStatusText() ), + statusBar(), TQ_SLOT( clear() ) ); createGUI( m_part ); @@ -79,7 +79,7 @@ CervisiaShell::CervisiaShell( const char *name ) setAutoSaveSettings("MainWindow", true); // if the session is restoring, we already read the settings - if( !kapp->isRestored() ) + if( !tdeApp->isRestored() ) readSettings(); } @@ -92,19 +92,19 @@ void CervisiaShell::setupActions() { setStandardToolBarMenuEnabled( true ); - TDEAction *action = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolBars()), + TDEAction *action = KStdAction::configureToolbars( this, TQ_SLOT(slotConfigureToolBars()), actionCollection() ); TQString hint = i18n("Allows you to configure the toolbar"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT(slotConfigureKeys()), + action = KStdAction::keyBindings( this, TQ_SLOT(slotConfigureKeys()), actionCollection() ); hint = i18n("Allows you to customize the keybindings"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = KStdAction::quit( TQT_TQOBJECT(kapp), TQT_SLOT( quit() ), actionCollection() ); + action = KStdAction::quit( tdeApp, TQ_SLOT( quit() ), actionCollection() ); hint = i18n("Exits Cervisia"); action->setToolTip( hint ); action->setWhatsThis( hint ); @@ -161,7 +161,7 @@ void CervisiaShell::slotConfigureToolBars() { saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg( factory() ); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(slotNewToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(slotNewToolbarConfig())); dlg.exec(); } @@ -183,7 +183,7 @@ void CervisiaShell::readProperties(TDEConfig* config) // if the session is restoring, make sure we open the URL // since it's not handled by main() - if( kapp->isRestored() ) + if( tdeApp->isRestored() ) openURL(); } diff --git a/cervisia/checkoutdlg.cpp b/cervisia/checkoutdlg.cpp index 1cce6c11..749aa96d 100644 --- a/cervisia/checkoutdlg.cpp +++ b/cervisia/checkoutdlg.cpp @@ -27,7 +27,7 @@ #include <tqlayout.h> #include <tqlabel.h> #include <tqpushbutton.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdefiledialog.h> #include <klineedit.h> #include <tdelocale.h> @@ -84,8 +84,8 @@ CheckoutDialog::CheckoutDialog(TDEConfig& cfg, CvsService_stub* service, module_combo = new TQComboBox(true, mainWidget); TQPushButton* module_button = new TQPushButton(i18n("Fetch &List"), mainWidget); - connect( module_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(moduleButtonClicked()) ); + connect( module_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(moduleButtonClicked()) ); TQBoxLayout* module_layout = new TQHBoxLayout(); grid->addLayout(module_layout, 1, 1); @@ -98,8 +98,8 @@ CheckoutDialog::CheckoutDialog(TDEConfig& cfg, CvsService_stub* service, branchCombo = new TQComboBox(true, mainWidget); TQPushButton* branchButton = new TQPushButton(i18n("Fetch &List"), mainWidget); - connect( branchButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(branchButtonClicked()) ); + connect( branchButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(branchButtonClicked()) ); TQBoxLayout* branchLayout = new TQHBoxLayout(); grid->addLayout(branchLayout, 2, 1); @@ -110,8 +110,8 @@ CheckoutDialog::CheckoutDialog(TDEConfig& cfg, CvsService_stub* service, mainWidget); grid->addWidget(branch_label, 2, 0, AlignLeft | AlignVCenter); - connect( branchCombo, TQT_SIGNAL( textChanged( const TQString&)), - this, TQT_SLOT( branchTextChanged() )); + connect( branchCombo, TQ_SIGNAL( textChanged( const TQString&)), + this, TQ_SLOT( branchTextChanged() )); recursive_box = new TQCheckBox(i18n("Re&cursive checkout"), mainWidget); grid->addMultiCellWidget(recursive_box, 6, 6, 0, 1); @@ -124,12 +124,12 @@ CheckoutDialog::CheckoutDialog(TDEConfig& cfg, CvsService_stub* service, KURLCompletion* comp = new KURLCompletion(); workdir_edit->setCompletionObject(comp); workdir_edit->setAutoDeleteCompletionObject(true); - connect( workdir_edit, TQT_SIGNAL(returnPressed(const TQString&)), - comp, TQT_SLOT(addItem(const TQString&)) ); + connect( workdir_edit, TQ_SIGNAL(returnPressed(const TQString&)), + comp, TQ_SLOT(addItem(const TQString&)) ); TQPushButton* dir_button = new TQPushButton("...", mainWidget); - connect( dir_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(dirButtonClicked()) ); + connect( dir_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(dirButtonClicked()) ); dir_button->setFixedWidth(30); TQBoxLayout* workdir_layout = new TQHBoxLayout(); diff --git a/cervisia/commitdlg.cpp b/cervisia/commitdlg.cpp index 7a25f430..8dd32db5 100644 --- a/cervisia/commitdlg.cpp +++ b/cervisia/commitdlg.cpp @@ -71,10 +71,10 @@ CommitDialog::CommitDialog(TDEConfig& cfg, CvsService_stub* service, m_fileList->setFullWidth(true); m_fileList->header()->hide(); textlabel->setBuddy(m_fileList); - connect( m_fileList, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(fileSelected(TQListViewItem*))); - connect( m_fileList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(fileHighlighted()) ); + connect( m_fileList, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(fileSelected(TQListViewItem*))); + connect( m_fileList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(fileHighlighted()) ); layout->addWidget(m_fileList, 5); TQLabel *archivelabel = new TQLabel(i18n("Older &messages:"), mainWidget); @@ -82,7 +82,7 @@ CommitDialog::CommitDialog(TDEConfig& cfg, CvsService_stub* service, combo = new TQComboBox(mainWidget); archivelabel->setBuddy(combo); - connect( combo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(comboActivated(int)) ); + connect( combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(comboActivated(int)) ); // make sure that combobox is smaller than the screen combo->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); layout->addWidget(combo); @@ -99,14 +99,14 @@ CommitDialog::CommitDialog(TDEConfig& cfg, CvsService_stub* service, m_useTemplateChk = new TQCheckBox(i18n("Use log message &template"), mainWidget); layout->addWidget(m_useTemplateChk); - connect( m_useTemplateChk, TQT_SIGNAL(clicked()), this, TQT_SLOT(useTemplateClicked()) ); + connect( m_useTemplateChk, TQ_SIGNAL(clicked()), this, TQ_SLOT(useTemplateClicked()) ); checkForTemplateFile(); setButtonGuiItem(User1, KGuiItem(i18n("&Diff"), "vcs_diff")); enableButton(User1, false); - connect( this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(diffClicked()) ); + connect( this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(diffClicked()) ); setHelp("commitingfiles"); diff --git a/cervisia/cvsinitdlg.cpp b/cervisia/cvsinitdlg.cpp index db39be24..3b1b308a 100644 --- a/cervisia/cvsinitdlg.cpp +++ b/cervisia/cvsinitdlg.cpp @@ -58,10 +58,10 @@ CvsInitDialog::CvsInitDialog(TQWidget* parent, const char* name) dirButton->setFixedWidth(30); dirLayout->addWidget(dirButton); - connect( dirButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(dirButtonClicked()) ); - connect( m_directoryEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(lineEditTextChanged(const TQString&))); + connect( dirButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(dirButtonClicked()) ); + connect( m_directoryEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(lineEditTextChanged(const TQString&))); enableButton(Ok, false); diff --git a/cervisia/cvsservice/DESIGN b/cervisia/cvsservice/DESIGN index 15c3eff4..20bd3a36 100644 --- a/cervisia/cvsservice/DESIGN +++ b/cervisia/cvsservice/DESIGN @@ -16,7 +16,7 @@ The cvs DCOP service consists of the following three parts: 3. CvsJob - This class represents a cvs job. You can execute and cancel it, and you can retrieve the output of the cvs client by either - connecting to the proper DCOP Q_SIGNALS or by using the output() + connecting to the proper DCOP signals or by using the output() method. There are two types of jobs. First the non-concurrent job which has to run alone, like cvs update or import. Second the jobs which can run concurrently like cvs log or annotate. @@ -45,7 +45,7 @@ How-to use this service in C++ applications: // call "cvs log" for cervisiapart.h DCOPRef job = cvsService.log("cervisiapart.h"); - // connect to Q_SIGNALS to get output + // connect to signals to get output connectDCOPSignal(job.app(), job.obj(), "jobExited(bool, int)", [MY SLOT]); connectDCOPSignal(job.app(), job.obj(), "receivedStdout(TQString)", [MY SLOT]); diff --git a/cervisia/cvsservice/cvsaskpass.cpp b/cervisia/cvsservice/cvsaskpass.cpp index dbe80fe8..0b9551b6 100644 --- a/cervisia/cvsservice/cvsaskpass.cpp +++ b/cervisia/cvsservice/cvsaskpass.cpp @@ -35,7 +35,7 @@ static TDECmdLineOptions options[] = }; -extern "C" KDE_EXPORT int kdemain(int argc, char** argv) +extern "C" TDE_EXPORT int kdemain(int argc, char** argv) { TDEAboutData about("cvsaskpass", I18N_NOOP("cvsaskpass"), "0.1", I18N_NOOP("ssh-askpass for the CVS DCOP Service"), diff --git a/cervisia/cvsservice/cvsjob.cpp b/cervisia/cvsservice/cvsjob.cpp index 24f42f48..2f181519 100644 --- a/cervisia/cvsservice/cvsjob.cpp +++ b/cervisia/cvsservice/cvsjob.cpp @@ -22,7 +22,7 @@ #include <tqfile.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "sshagent.h" @@ -176,12 +176,12 @@ bool CvsJob::execute() if( !d->directory.isEmpty() ) d->childproc->setWorkingDirectory(d->directory); - connect(d->childproc, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited())); - connect(d->childproc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(d->childproc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) ); + connect(d->childproc, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited())); + connect(d->childproc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(d->childproc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) ); kdDebug(8051) << "Execute cvs command: " << cvsCommand() << endl; diff --git a/cervisia/cvsservice/cvsjob.h b/cervisia/cvsservice/cvsjob.h index ef2e20e8..d7c127d1 100644 --- a/cervisia/cvsservice/cvsjob.h +++ b/cervisia/cvsservice/cvsjob.h @@ -29,7 +29,7 @@ class TDEProcess; -class KDE_EXPORT CvsJob : public TQObject, public DCOPObject +class TDE_EXPORT CvsJob : public TQObject, public DCOPObject { TQ_OBJECT // diff --git a/cervisia/cvsservice/cvsservice.cpp b/cervisia/cvsservice/cvsservice.cpp index 9eabda4c..21370f83 100644 --- a/cervisia/cvsservice/cvsservice.cpp +++ b/cervisia/cvsservice/cvsservice.cpp @@ -29,7 +29,7 @@ #include <tdeconfig.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "cvsjob.h" #include "cvsloginjob.h" @@ -74,7 +74,7 @@ CvsService::CvsService() : DCOPObject("CvsService") , d(new Private) { - d->appId = kapp->dcopClient()->appId(); + d->appId = tdeApp->dcopClient()->appId(); // create non-concurrent cvs job d->singleCvsJob = new CvsJob(SINGLE_JOB_ID); @@ -86,7 +86,7 @@ CvsService::CvsService() d->cvsJobs.setAutoDelete(true); d->loginJobs.setAutoDelete(true); - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); TDEConfigGroupSaver cs(config, "General"); if( config->readBoolEntry("UseSshAgent", false) ) { @@ -950,7 +950,7 @@ DCOPRef CvsService::watchers(const TQStringList& files) void CvsService::quit() { - kapp->quit(); + tdeApp->quit(); } diff --git a/cervisia/cvsservice/cvsservice.h b/cervisia/cvsservice/cvsservice.h index cfa5bce1..50884075 100644 --- a/cervisia/cvsservice/cvsservice.h +++ b/cervisia/cvsservice/cvsservice.h @@ -28,7 +28,7 @@ class TQString; -class KDE_EXPORT CvsService : public DCOPObject +class TDE_EXPORT CvsService : public DCOPObject { K_DCOP diff --git a/cervisia/cvsservice/cvsserviceutils.cpp b/cervisia/cvsservice/cvsserviceutils.cpp index b08c4357..e74da0d1 100644 --- a/cervisia/cvsservice/cvsserviceutils.cpp +++ b/cervisia/cvsservice/cvsserviceutils.cpp @@ -22,7 +22,7 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <kprocess.h> +#include <tdeprocess.h> TQString CvsServiceUtils::joinFileList(const TQStringList& files) diff --git a/cervisia/cvsservice/main.cpp b/cervisia/cvsservice/main.cpp index 6e11f605..b6a51b6e 100644 --- a/cervisia/cvsservice/main.cpp +++ b/cervisia/cvsservice/main.cpp @@ -25,7 +25,7 @@ #include "cvsservice.h" -extern "C" KDE_EXPORT int kdemain(int argc, char** argv) +extern "C" TDE_EXPORT int kdemain(int argc, char** argv) { TDEAboutData about("cvsservice", I18N_NOOP("CVS DCOP service"), "0.1", I18N_NOOP("DCOP service for CVS"), TDEAboutData::License_LGPL, diff --git a/cervisia/cvsservice/repository.cpp b/cervisia/cvsservice/repository.cpp index 74635a84..ac2c9255 100644 --- a/cervisia/cvsservice/repository.cpp +++ b/cervisia/cvsservice/repository.cpp @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <tdeconfig.h> #include <kdirwatch.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "sshagent.h" @@ -64,8 +64,8 @@ Repository::Repository() // so we watch it for changes d->configFileName = locate("config", "cvsservicerc"); KDirWatch* fileWatcher = new KDirWatch(this); - connect(fileWatcher, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(slotConfigDirty(const TQString&))); + connect(fileWatcher, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(slotConfigDirty(const TQString&))); fileWatcher->addFile(d->configFileName); } @@ -83,8 +83,8 @@ Repository::Repository(const TQString& repository) // so we watch it for changes d->configFileName = locate("config", "cvsservicerc"); KDirWatch* fileWatcher = new KDirWatch(this); - connect(fileWatcher, TQT_SIGNAL(dirty(const TQString&)), - this, TQT_SLOT(slotConfigDirty(const TQString&))); + connect(fileWatcher, TQ_SIGNAL(dirty(const TQString&)), + this, TQ_SLOT(slotConfigDirty(const TQString&))); fileWatcher->addFile(d->configFileName); } @@ -193,7 +193,7 @@ void Repository::slotConfigDirty(const TQString& fileName) if( fileName == d->configFileName ) { // reread the configuration data from disk - kapp->config()->reparseConfiguration(); + tdeApp->config()->reparseConfiguration(); d->readConfig(); } } @@ -201,7 +201,7 @@ void Repository::slotConfigDirty(const TQString& fileName) void Repository::Private::readGeneralConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); // get path to cvs client programm config->setGroup("General"); @@ -211,7 +211,7 @@ void Repository::Private::readGeneralConfig() void Repository::Private::readConfig() { - TDEConfig* config = kapp->config(); + TDEConfig* config = tdeApp->config(); // Sometimes the location can be unequal to the entry in the CVS/Root. // diff --git a/cervisia/cvsservice/repository.h b/cervisia/cvsservice/repository.h index 45c32896..0e5ccd03 100644 --- a/cervisia/cvsservice/repository.h +++ b/cervisia/cvsservice/repository.h @@ -31,7 +31,7 @@ class TQString; * Represents a local or remote cvs repository with * its repository-specific configuration data. */ -class KDE_EXPORT Repository : public TQObject, public DCOPObject +class TDE_EXPORT Repository : public TQObject, public DCOPObject { K_DCOP TQ_OBJECT diff --git a/cervisia/cvsservice/sshagent.cpp b/cervisia/cvsservice/sshagent.cpp index 6fbf0cb1..80ce2fd8 100644 --- a/cervisia/cvsservice/sshagent.cpp +++ b/cervisia/cvsservice/sshagent.cpp @@ -24,7 +24,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdeversion.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <stdlib.h> @@ -99,10 +99,10 @@ bool SshAgent::addSshIdentities() proc << "ssh-add"; - connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); + connect(&proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(&proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int))); proc.start(TDEProcess::DontCare, TDEProcess::AllOutput); @@ -217,12 +217,12 @@ bool SshAgent::startSshAgent() proc << "ssh-agent"; - connect(&proc, TQT_SIGNAL(processExited(TDEProcess*)), - TQT_SLOT(slotProcessExited(TDEProcess*))); - connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); - connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) ); + connect(&proc, TQ_SIGNAL(processExited(TDEProcess*)), + TQ_SLOT(slotProcessExited(TDEProcess*))); + connect(&proc, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + TQ_SLOT(slotReceivedStdout(TDEProcess*, char*, int))); + connect(&proc, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + TQ_SLOT(slotReceivedStderr(TDEProcess*, char*, int)) ); proc.start(TDEProcess::NotifyOnExit, TDEProcess::All); diff --git a/cervisia/diffdlg.cpp b/cervisia/diffdlg.cpp index 41116256..c1a9fc0b 100644 --- a/cervisia/diffdlg.cpp +++ b/cervisia/diffdlg.cpp @@ -32,7 +32,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <tdetempfile.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "cvsservice_stub.h" #include "repository_stub.h" @@ -81,25 +81,25 @@ DiffDialog::DiffDialog(TDEConfig& cfg, TQWidget *parent, const char *name, bool syncbox = new TQCheckBox(i18n("Synchronize scroll bars"), mainWidget); syncbox->setChecked(true); - connect( syncbox, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(toggleSynchronize(bool)) ); + connect( syncbox, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(toggleSynchronize(bool)) ); itemscombo = new TQComboBox(mainWidget); itemscombo->insertItem(TQString()); - connect( itemscombo, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(comboActivated(int)) ); + connect( itemscombo, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(comboActivated(int)) ); nofnlabel = new TQLabel(mainWidget); // avoids auto resize when the text is changed nofnlabel->setMinimumWidth(fontMetrics().width(i18n("%1 differences").arg(10000))); backbutton = new TQPushButton(TQString::fromLatin1("&<<"), mainWidget); - connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) ); + connect( backbutton, TQ_SIGNAL(clicked()), TQ_SLOT(backClicked()) ); forwbutton = new TQPushButton(TQString::fromLatin1("&>>"), mainWidget); - connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) ); + connect( forwbutton, TQ_SIGNAL(clicked()), TQ_SLOT(forwClicked()) ); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) ); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(saveAsClicked()) ); TQBoxLayout *buttonlayout = new TQHBoxLayout(layout); buttonlayout->addWidget(syncbox, 0); diff --git a/cervisia/diffview.cpp b/cervisia/diffview.cpp index d246ca7b..21408b5d 100644 --- a/cervisia/diffview.cpp +++ b/cervisia/diffview.cpp @@ -103,14 +103,14 @@ void DiffView::setPartner(DiffView *other) partner = other; if (partner) { - connect( verticalScrollBar(), TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(vertPositionChanged(int)) ); - connect( verticalScrollBar(), TQT_SIGNAL(sliderMoved(int)), - TQT_SLOT(vertPositionChanged(int)) ); - connect( horizontalScrollBar(), TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(horzPositionChanged(int)) ); - connect( horizontalScrollBar(), TQT_SIGNAL(sliderMoved(int)), - TQT_SLOT(horzPositionChanged(int)) ); + connect( verticalScrollBar(), TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(vertPositionChanged(int)) ); + connect( verticalScrollBar(), TQ_SIGNAL(sliderMoved(int)), + TQ_SLOT(vertPositionChanged(int)) ); + connect( horizontalScrollBar(), TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(horzPositionChanged(int)) ); + connect( horizontalScrollBar(), TQ_SIGNAL(sliderMoved(int)), + TQ_SLOT(horzPositionChanged(int)) ); } } diff --git a/cervisia/editwithmenu.cpp b/cervisia/editwithmenu.cpp index 6be3a85e..61bddf44 100644 --- a/cervisia/editwithmenu.cpp +++ b/cervisia/editwithmenu.cpp @@ -50,7 +50,7 @@ EditWithMenu::EditWithMenu(const KURL& url, TQWidget* parent) { int id = m_menu->insertItem(SmallIcon((*it)->icon()), (*it)->name(), - this, TQT_SLOT(itemActivated(int))); + this, TQ_SLOT(itemActivated(int))); m_menu->setItemParameter(id, i); } } diff --git a/cervisia/historydlg.cpp b/cervisia/historydlg.cpp index e8bd8159..539b5c78 100644 --- a/cervisia/historydlg.cpp +++ b/cervisia/historydlg.cpp @@ -188,32 +188,32 @@ HistoryDialog::HistoryDialog(TDEConfig& cfg, TQWidget *parent, const char *name) dirname_edit = new KLineEdit(mainWidget); dirname_edit->setEnabled(false); - connect( onlyuser_box, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(toggled(bool)) ); - connect( onlyfilenames_box, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(toggled(bool)) ); - connect( onlydirnames_box, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(toggled(bool)) ); - connect( commit_box, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(choiceChanged()) ); - connect( checkout_box, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(choiceChanged()) ); - connect( tag_box, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(choiceChanged()) ); - connect( other_box, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(choiceChanged()) ); - connect( onlyuser_box, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(choiceChanged()) ); - connect( onlyfilenames_box, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(choiceChanged()) ); - connect( onlydirnames_box, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(choiceChanged()) ); - connect( user_edit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(choiceChanged()) ); - connect( filename_edit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(choiceChanged()) ); - connect( dirname_edit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(choiceChanged()) ); + connect( onlyuser_box, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(toggled(bool)) ); + connect( onlyfilenames_box, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(toggled(bool)) ); + connect( onlydirnames_box, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(toggled(bool)) ); + connect( commit_box, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(choiceChanged()) ); + connect( checkout_box, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(choiceChanged()) ); + connect( tag_box, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(choiceChanged()) ); + connect( other_box, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(choiceChanged()) ); + connect( onlyuser_box, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(choiceChanged()) ); + connect( onlyfilenames_box, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(choiceChanged()) ); + connect( onlydirnames_box, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(choiceChanged()) ); + connect( user_edit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(choiceChanged()) ); + connect( filename_edit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(choiceChanged()) ); + connect( dirname_edit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(choiceChanged()) ); TQGridLayout *grid = new TQGridLayout(layout); grid->setColStretch(0, 1); diff --git a/cervisia/logdlg.cpp b/cervisia/logdlg.cpp index 11086c9a..2c6433df 100644 --- a/cervisia/logdlg.cpp +++ b/cervisia/logdlg.cpp @@ -39,7 +39,7 @@ #include <tdelistviewsearchline.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <krfcdate.h> #include <krun.h> #include <kurl.h> @@ -70,8 +70,8 @@ LogDialog::LogDialog(TDEConfig& cfg, TQWidget *parent, const char *name) setMainWidget(splitter); tree = new LogTreeView(this); - connect( tree, TQT_SIGNAL(revisionClicked(TQString,bool)), - this, TQT_SLOT(revisionSelected(TQString,bool)) ); + connect( tree, TQ_SIGNAL(revisionClicked(TQString,bool)), + this, TQ_SLOT(revisionSelected(TQString,bool)) ); TQWidget* listWidget = new TQWidget(this); TQVBoxLayout* listLayout = new TQVBoxLayout(listWidget); @@ -87,20 +87,20 @@ LogDialog::LogDialog(TDEConfig& cfg, TQWidget *parent, const char *name) searchLayout->addWidget(searchLabel); searchLayout->addWidget(searchLine, 1); - connect( list, TQT_SIGNAL(revisionClicked(TQString,bool)), - this, TQT_SLOT(revisionSelected(TQString,bool)) ); + connect( list, TQ_SIGNAL(revisionClicked(TQString,bool)), + this, TQ_SLOT(revisionSelected(TQString,bool)) ); plain = new LogPlainView(this); - connect( plain, TQT_SIGNAL(revisionClicked(TQString,bool)), - this, TQT_SLOT(revisionSelected(TQString,bool)) ); + connect( plain, TQ_SIGNAL(revisionClicked(TQString,bool)), + this, TQ_SLOT(revisionSelected(TQString,bool)) ); tabWidget = new TQTabWidget(splitter); tabWidget->addTab(tree, i18n("&Tree")); tabWidget->addTab(listWidget, i18n("&List")); tabWidget->addTab(plain, i18n("CVS &Output")); - connect(tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), - this, TQT_SLOT(tabChanged(TQWidget*))); + connect(tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), + this, TQ_SLOT(tabChanged(TQWidget*))); TQWhatsThis::add(tree, i18n("Choose revision A by clicking with the left " "mouse button,\nrevision B by clicking with " @@ -183,17 +183,17 @@ LogDialog::LogDialog(TDEConfig& cfg, TQWidget *parent, const char *name) TQWhatsThis::add(revbox[1], i18n("This revision is used as the second " "item of a Diff operation.")); - connect( tagcombo[0], TQT_SIGNAL(activated(int)), - this, TQT_SLOT(tagASelected(int)) ); - connect( tagcombo[1], TQT_SIGNAL(activated(int)), - this, TQT_SLOT(tagBSelected(int)) ); - - connect( this, TQT_SIGNAL(user1Clicked()), - this, TQT_SLOT(annotateClicked()) ); - connect( this, TQT_SIGNAL(user2Clicked()), - this, TQT_SLOT(diffClicked()) ); - connect( this, TQT_SIGNAL(user3Clicked()), - this, TQT_SLOT(findClicked()) ); + connect( tagcombo[0], TQ_SIGNAL(activated(int)), + this, TQ_SLOT(tagASelected(int)) ); + connect( tagcombo[1], TQ_SIGNAL(activated(int)), + this, TQ_SLOT(tagBSelected(int)) ); + + connect( this, TQ_SIGNAL(user1Clicked()), + this, TQ_SLOT(annotateClicked()) ); + connect( this, TQ_SIGNAL(user2Clicked()), + this, TQ_SLOT(diffClicked()) ); + connect( this, TQ_SIGNAL(user3Clicked()), + this, TQ_SLOT(findClicked()) ); setButtonGuiItem(Ok, KGuiItem(i18n("to view something", "&View"),"document-open")); setButtonGuiItem(Apply, KGuiItem(i18n("Create Patch..."))); diff --git a/cervisia/loglist.cpp b/cervisia/loglist.cpp index a5986f7e..46635c5c 100644 --- a/cervisia/loglist.cpp +++ b/cervisia/loglist.cpp @@ -124,8 +124,8 @@ LogListView::LogListView(TDEConfig& cfg, TQWidget *parent, const char *name) Cervisia::ToolTip* toolTip = new Cervisia::ToolTip(viewport()); - connect(toolTip, TQT_SIGNAL(queryToolTip(const TQPoint&, TQRect&, TQString&)), - this, TQT_SLOT(slotQueryToolTip(const TQPoint&, TQRect&, TQString&))); + connect(toolTip, TQ_SIGNAL(queryToolTip(const TQPoint&, TQRect&, TQString&)), + this, TQ_SLOT(slotQueryToolTip(const TQPoint&, TQRect&, TQString&))); // without this restoreLayout() can't change the column widths for (int i = 0; i < columns(); ++i) diff --git a/cervisia/logmessageedit.cpp b/cervisia/logmessageedit.cpp index bcc0e97d..567dda97 100644 --- a/cervisia/logmessageedit.cpp +++ b/cervisia/logmessageedit.cpp @@ -36,7 +36,7 @@ LogMessageEdit::LogMessageEdit(TQWidget* parent) completionObject(); // a mouse click stops the completion process - connect( this, TQT_SIGNAL(clicked(int, int)), TQT_SLOT(stopCompletion()) ); + connect( this, TQ_SIGNAL(clicked(int, int)), TQ_SLOT(stopCompletion()) ); } diff --git a/cervisia/logplainview.cpp b/cervisia/logplainview.cpp index 4cf78061..c8272648 100644 --- a/cervisia/logplainview.cpp +++ b/cervisia/logplainview.cpp @@ -109,10 +109,10 @@ void LogPlainView::searchText(int options, const TQString& pattern) { m_find = new KFind(pattern, options, this); - connect(m_find, TQT_SIGNAL(highlight(const TQString&, int, int)), - this, TQT_SLOT(searchHighlight(const TQString&, int, int))); - connect(m_find, TQT_SIGNAL(findNext()), - this, TQT_SLOT(findNext())); + connect(m_find, TQ_SIGNAL(highlight(const TQString&, int, int)), + this, TQ_SLOT(searchHighlight(const TQString&, int, int))); + connect(m_find, TQ_SIGNAL(findNext()), + this, TQ_SLOT(findNext())); m_findPos = 0; if( options & KFindDialog::FromCursor ) diff --git a/cervisia/logtree.cpp b/cervisia/logtree.cpp index 06899a10..aa5ff010 100644 --- a/cervisia/logtree.cpp +++ b/cervisia/logtree.cpp @@ -92,8 +92,8 @@ LogTreeView::LogTreeView(TQWidget *parent, const char *name) Cervisia::ToolTip* toolTip = new Cervisia::ToolTip(viewport()); - connect(toolTip, TQT_SIGNAL(queryToolTip(const TQPoint&, TQRect&, TQString&)), - this, TQT_SLOT(slotQueryToolTip(const TQPoint&, TQRect&, TQString&))); + connect(toolTip, TQ_SIGNAL(queryToolTip(const TQPoint&, TQRect&, TQString&)), + this, TQ_SLOT(slotQueryToolTip(const TQPoint&, TQRect&, TQString&))); } diff --git a/cervisia/main.cpp b/cervisia/main.cpp index 7c971cf9..3bf8ca41 100644 --- a/cervisia/main.cpp +++ b/cervisia/main.cpp @@ -65,13 +65,13 @@ static int ShowResolveDialog(const TQString& fileName) TDEConfig* config = new TDEConfig("cervisiapartrc"); ResolveDialog* dlg = new ResolveDialog(*config); - kapp->setMainWidget(dlg); + tdeApp->setMainWidget(dlg); if( dlg->parseFile(fileName) ) dlg->show(); else delete dlg; - int result = kapp->exec(); + int result = tdeApp->exec(); delete config; @@ -83,7 +83,7 @@ static int ShowLogDialog(const TQString& fileName) { TDEConfig* config = new TDEConfig("cervisiapartrc"); LogDialog* dlg = new LogDialog(*config); - kapp->setMainWidget(dlg); + tdeApp->setMainWidget(dlg); // get directory for file const TQFileInfo fi(fileName); @@ -97,7 +97,7 @@ static int ShowLogDialog(const TQString& fileName) else delete dlg; - int result = kapp->exec(); + int result = tdeApp->exec(); // stop the cvs DCOP service cvsService->quit(); @@ -113,7 +113,7 @@ static int ShowAnnotateDialog(const TQString& fileName) { TDEConfig* config = new TDEConfig("cervisiapartrc"); AnnotateDialog* dlg = new AnnotateDialog(*config); - kapp->setMainWidget(dlg); + tdeApp->setMainWidget(dlg); // get directory for file const TQFileInfo fi(fileName); @@ -125,7 +125,7 @@ static int ShowAnnotateDialog(const TQString& fileName) AnnotateController ctl(dlg, cvsService); ctl.showDialog(fi.fileName()); - int result = kapp->exec(); + int result = tdeApp->exec(); // stop the cvs DCOP service cvsService->quit(); @@ -137,7 +137,7 @@ static int ShowAnnotateDialog(const TQString& fileName) } -extern "C" KDE_EXPORT int kdemain(int argc, char **argv) +extern "C" TDE_EXPORT int kdemain(int argc, char **argv) { static TDECmdLineOptions options[] = { { "+[directory]", I18N_NOOP("The sandbox to be loaded"), 0 }, diff --git a/cervisia/mergedlg.cpp b/cervisia/mergedlg.cpp index 1157dd3b..63c3a653 100644 --- a/cervisia/mergedlg.cpp +++ b/cervisia/mergedlg.cpp @@ -54,8 +54,8 @@ MergeDialog::MergeDialog(CvsService_stub* service, branch_combo->setMinimumWidth(iComboBoxMinWidth); branch_button = new TQPushButton(i18n("Fetch &List"), mainWidget); - connect( branch_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(branchButtonClicked()) ); + connect( branch_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(branchButtonClicked()) ); TQBoxLayout *branchedit_layout = new TQHBoxLayout(layout); branchedit_layout->addSpacing(iWidgetIndent); @@ -74,8 +74,8 @@ MergeDialog::MergeDialog(CvsService_stub* service, tag2_combo->setMinimumWidth(iComboBoxMinWidth); tag_button = new TQPushButton(i18n("Fetch L&ist"), mainWidget); - connect( tag_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(tagButtonClicked()) ); + connect( tag_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(tagButtonClicked()) ); TQGridLayout *tagsedit_layout = new TQGridLayout(layout); tagsedit_layout->addColSpacing(0, iWidgetIndent); @@ -93,8 +93,8 @@ MergeDialog::MergeDialog(CvsService_stub* service, group->hide(); group->insert(bybranch_button); group->insert(bytags_button); - connect( group, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(toggled()) ); + connect( group, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(toggled()) ); // dis-/enable the widgets toggled(); diff --git a/cervisia/misc.cpp b/cervisia/misc.cpp index f72f29bd..4b6df924 100644 --- a/cervisia/misc.cpp +++ b/cervisia/misc.cpp @@ -33,7 +33,7 @@ #include <tdeemailsettings.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <kuser.h> #include <kdebug.h> diff --git a/cervisia/patchoptiondlg.cpp b/cervisia/patchoptiondlg.cpp index 43ba7fdf..64e0cb13 100644 --- a/cervisia/patchoptiondlg.cpp +++ b/cervisia/patchoptiondlg.cpp @@ -38,8 +38,8 @@ PatchOptionDialog::PatchOptionDialog(TQWidget* parent, const char* name) m_formatBtnGroup = new TQVButtonGroup(i18n("Output Format"), mainWidget, ""); topLayout->addWidget(m_formatBtnGroup); - connect(m_formatBtnGroup, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(formatChanged(int))); + connect(m_formatBtnGroup, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(formatChanged(int))); new TQRadioButton(i18n( "Context" ), m_formatBtnGroup); new TQRadioButton(i18n( "Normal" ), m_formatBtnGroup); diff --git a/cervisia/progressdlg.cpp b/cervisia/progressdlg.cpp index 42783adc..e29a2017 100644 --- a/cervisia/progressdlg.cpp +++ b/cervisia/progressdlg.cpp @@ -125,7 +125,7 @@ bool ProgressDialog::execute() // we wait for 4 seconds (or the timeout set by the user) before we // force the dialog to show up d->timer = new TQTimer(this); - connect(d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeoutOccurred())); + connect(d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeoutOccurred())); d->timer->start(CervisiaSettings::timeout(), true); bool started = d->cvsJob->execute(); @@ -133,7 +133,7 @@ bool ProgressDialog::execute() return false; TQApplication::setOverrideCursor(waitCursor); - kapp->enter_loop(); + tdeApp->enter_loop(); if (TQApplication::overrideCursor()) TQApplication::restoreOverrideCursor(); @@ -197,7 +197,7 @@ void ProgressDialog::slotJobExited(bool normalExit, int status) // error messages or the process has been aborted // 'by hand' (e.g. by clicking the cancel button) if( !d->hasError || !normalExit ) - kapp->exit_loop(); + tdeApp->exit_loop(); } @@ -209,7 +209,7 @@ void ProgressDialog::slotCancel() if( isRunning ) d->cvsJob->cancel(); else - kapp->exit_loop(); + tdeApp->exit_loop(); } @@ -229,7 +229,7 @@ void ProgressDialog::stopNonGuiPart() disconnectDCOPSignal(d->cvsJob->app(), d->cvsJob->obj(), "receivedStderr(TQString)", "slotReceivedOutputNonGui(TQString)"); - kapp->exit_loop(); + tdeApp->exit_loop(); } @@ -245,7 +245,7 @@ void ProgressDialog::startGuiPart() d->gear->start(); TQApplication::restoreOverrideCursor(); - kapp->enter_loop(); + tdeApp->enter_loop(); } diff --git a/cervisia/protocolview.cpp b/cervisia/protocolview.cpp index f64ac0af..a5847fba 100644 --- a/cervisia/protocolview.cpp +++ b/cervisia/protocolview.cpp @@ -84,8 +84,8 @@ bool ProtocolView::startJob(bool isUpdateJob) processOutput(); // disconnect 3rd party slots from our signals - disconnect( TQT_SIGNAL(receivedLine(TQString)) ); - disconnect( TQT_SIGNAL(jobFinished(bool, int)) ); + disconnect( TQ_SIGNAL(receivedLine(TQString)) ); + disconnect( TQ_SIGNAL(jobFinished(bool, int)) ); return job->execute(); } @@ -95,7 +95,7 @@ TQPopupMenu* ProtocolView::createPopupMenu(const TQPoint &pos) { TQPopupMenu* menu = TQTextEdit::createPopupMenu(pos); - int id = menu->insertItem(i18n("Clear"), this, TQT_SLOT( clear() ), 0, -1, 0); + int id = menu->insertItem(i18n("Clear"), this, TQ_SLOT( clear() ), 0, -1, 0); if( length() == 0 ) menu->setItemEnabled(id, false); diff --git a/cervisia/qttableview.cpp b/cervisia/qttableview.cpp index 6c02819c..91447276 100644 --- a/cervisia/qttableview.cpp +++ b/cervisia/qttableview.cpp @@ -107,7 +107,7 @@ void TQCornerSquare::paintEvent( TQPaintEvent * ) \warning the functions setNumRows(), setNumCols(), setCellHeight(), setCellWidth(), setTableFlags() and clearTableFlags() may cause virtual functions such as cellWidth() and cellHeight() to be called, - even if autoUpdate() is FALSE. This may cause errors if relevant + even if autoUpdate() is false. This may cause errors if relevant state variables are not initialized. \warning Experience has shown that use of this widget tends to cause @@ -155,13 +155,13 @@ QtTableView::QtTableView( TQWidget *parent, const char *name, WFlags f ) vScrollBar = hScrollBar = 0; // no scroll bars cornerSquare = 0; sbDirty = 0; - eraseInPaint = FALSE; - verSliding = FALSE; - verSnappingOff = FALSE; - horSliding = FALSE; - horSnappingOff = FALSE; - coveringCornerSquare = FALSE; - inSbUpdate = FALSE; + eraseInPaint = false; + verSliding = false; + verSnappingOff = false; + horSliding = false; + horSnappingOff = false; + coveringCornerSquare = false; + inSbUpdate = false; } /*! @@ -214,7 +214,7 @@ void QtTableView::show() Repaints the table view directly by calling paintEvent() directly unless updates are disabled. - Erases the view area \a (x,y,w,h) if \a erase is TRUE. Parameters \a + Erases the view area \a (x,y,w,h) if \a erase is true. Parameters \a (x,y) are in \e widget coordinates. If \a w is negative, it is replaced with <code>width() - x</code>. @@ -242,14 +242,14 @@ void QtTableView::repaint( int x, int y, int w, int h, bool erase ) return; // nothing to do TQPaintEvent e( r ); if ( erase && backgroundMode() != NoBackground ) - eraseInPaint = TRUE; // erase when painting + eraseInPaint = true; // erase when painting paintEvent( &e ); - eraseInPaint = FALSE; + eraseInPaint = false; } /*! \overload void QtTableView::repaint( const TQRect &r, bool erase ) - Replaints rectangle \a r. If \a erase is TRUE draws the background + Replaints rectangle \a r. If \a erase is true draws the background using the palette's background. */ @@ -463,7 +463,7 @@ void QtTableView::setYOffset( int y ) in the view. Parameters \a (x,y) are in \e table coordinates. The interaction with \link setTableFlags() Tbl_snapTo*Grid \endlink - is tricky. If \a updateScrBars is TRUE, the scroll bars are + is tricky. If \a updateScrBars is true, the scroll bars are updated. \sa xOffset(), yOffset(), setXOffset(), setYOffset(), setTopLeftCell() @@ -706,8 +706,8 @@ int QtTableView::totalHeight() /*! \fn bool QtTableView::testTableFlags( uint f ) const - Returns TRUE if any of the table flags in \a f are currently set, - otherwise FALSE. + Returns true if any of the table flags in \a f are currently set, + otherwise false. \sa setTableFlags(), clearTableFlags(), tableFlags() */ @@ -716,7 +716,7 @@ int QtTableView::totalHeight() Sets the table flags to \a f. If a flag setting changes the appearance of the table, the table is - repainted if - and only if - autoUpdate() is TRUE. + repainted if - and only if - autoUpdate() is true. The table flags are mostly single bits, though there are some multibit flags for convenience. Here is a complete list: @@ -783,15 +783,15 @@ void QtTableView::setTableFlags( uint f ) tFlags |= f; bool updateOn = autoUpdate(); - setAutoUpdate( FALSE ); + setAutoUpdate( false ); uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH; if ( f & Tbl_vScrollBar ) { - setVerScrollBar( TRUE ); + setVerScrollBar( true ); } if ( f & Tbl_hScrollBar ) { - setHorScrollBar( TRUE ); + setHorScrollBar( true ); } if ( f & Tbl_autoVScrollBar ) { updateScrollBars( verRange ); @@ -821,7 +821,7 @@ void QtTableView::setTableFlags( uint f ) } if ( updateOn ) { - setAutoUpdate( TRUE ); + setAutoUpdate( true ); updateScrollBars(); if ( isVisible() && (f & repaintMask) ) repaint(); @@ -849,15 +849,15 @@ void QtTableView::clearTableFlags( uint f ) tFlags &= ~f; bool updateOn = autoUpdate(); - setAutoUpdate( FALSE ); + setAutoUpdate( false ); uint repaintMask = Tbl_cutCellsV | Tbl_cutCellsH; if ( f & Tbl_vScrollBar ) { - setVerScrollBar( FALSE ); + setVerScrollBar( false ); } if ( f & Tbl_hScrollBar ) { - setHorScrollBar( FALSE ); + setHorScrollBar( false ); } if ( f & Tbl_scrollLastHCell ) { int maxX = maxXOffset(); @@ -890,7 +890,7 @@ void QtTableView::clearTableFlags( uint f ) updateScrollBars( verRange ); } if ( updateOn ) { - setAutoUpdate( TRUE ); + setAutoUpdate( true ); updateScrollBars(); // returns immediately if nothing to do if ( isVisible() && (f & repaintMask) ) repaint(); @@ -902,7 +902,7 @@ void QtTableView::clearTableFlags( uint f ) /*! \fn bool QtTableView::autoUpdate() const - Returns TRUE if the view updates itself automatically whenever it + Returns true if the view updates itself automatically whenever it is changed in some way. \sa setAutoUpdate() @@ -911,11 +911,11 @@ void QtTableView::clearTableFlags( uint f ) /*! Sets the auto-update option of the table view to \a enable. - If \a enable is TRUE (this is the default), the view updates itself + If \a enable is true (this is the default), the view updates itself automatically whenever it has changed in some way (for example, when a \link setTableFlags() flag\endlink is changed). - If \a enable is FALSE, the view does NOT repaint itself or update + If \a enable is false, the view does NOT repaint itself or update its internal state variables when it is changed. This can be useful to avoid flicker during large changes and is singularly useless otherwise. Disable auto-update, do the changes, re-enable @@ -925,7 +925,7 @@ void QtTableView::clearTableFlags( uint f ) (i.e., between events). If, for example, the user interacts with the view when auto-update is off, strange things can happen. - Setting auto-update to TRUE does not repaint the view; you must call + Setting auto-update to true does not repaint the view; you must call repaint() to do this. \sa autoUpdate(), repaint() @@ -946,7 +946,7 @@ void QtTableView::setAutoUpdate( bool enable ) /*! Repaints the cell at row \a row, column \a col if it is inside the view. - If \a erase is TRUE, the relevant part of the view is cleared to the + If \a erase is true, the relevant part of the view is cleared to the background color/pixmap before the contents are repainted. \sa isVisible() @@ -1042,7 +1042,7 @@ int QtTableView::lastColVisible() const } /*! - Returns TRUE if \a row is at least partially visible. + Returns true if \a row is at least partially visible. \sa colIsVisible() */ @@ -1052,7 +1052,7 @@ bool QtTableView::rowIsVisible( int row ) const } /*! - Returns TRUE if \a col is at least partially visible. + Returns true if \a col is at least partially visible. \sa rowIsVisible() */ @@ -1092,10 +1092,10 @@ void QtTableView::coverCornerSquare( bool enable ) \internal Scroll the view to a position such that: - If \a horizontal is TRUE, the leftmost column shown fits snugly + If \a horizontal is true, the leftmost column shown fits snugly with the left edge of the view. - If \a vertical is TRUE, the top row shown fits snugly with the top + If \a vertical is true, the top row shown fits snugly with the top of the view. You can achieve the same effect automatically by setting any of the @@ -1135,13 +1135,13 @@ void QtTableView::snapToGrid( bool horizontal, bool vertical ) void QtTableView::horSbValue( int val ) { if ( horSliding ) { - horSliding = FALSE; + horSliding = false; if ( horSnappingOff ) { - horSnappingOff = FALSE; + horSnappingOff = false; tFlags |= Tbl_snapToHGrid; } } - setOffset( val, yOffs, FALSE ); + setOffset( val, yOffs, false ); } /*! @@ -1157,10 +1157,10 @@ void QtTableView::horSbSliding( int val ) if ( testTableFlags(Tbl_snapToHGrid) && testTableFlags(Tbl_smoothHScrolling) ) { tFlags &= ~Tbl_snapToHGrid; // turn off snapping while sliding - setOffset( val, yOffs, FALSE ); + setOffset( val, yOffs, false ); tFlags |= Tbl_snapToHGrid; // turn on snapping again } else { - setOffset( val, yOffs, FALSE ); + setOffset( val, yOffs, false ); } } @@ -1174,7 +1174,7 @@ void QtTableView::horSbSlidingDone( ) { if ( testTableFlags(Tbl_snapToHGrid) && testTableFlags(Tbl_smoothHScrolling) ) - snapToGrid( TRUE, FALSE ); + snapToGrid( true, false ); } /*! @@ -1189,13 +1189,13 @@ void QtTableView::horSbSlidingDone( ) void QtTableView::verSbValue( int val ) { if ( verSliding ) { - verSliding = FALSE; + verSliding = false; if ( verSnappingOff ) { - verSnappingOff = FALSE; + verSnappingOff = false; tFlags |= Tbl_snapToVGrid; } } - setOffset( xOffs, val, FALSE ); + setOffset( xOffs, val, false ); } /*! @@ -1211,10 +1211,10 @@ void QtTableView::verSbSliding( int val ) if ( testTableFlags(Tbl_snapToVGrid) && testTableFlags(Tbl_smoothVScrolling) ) { tFlags &= ~Tbl_snapToVGrid; // turn off snapping while sliding - setOffset( xOffs, val, FALSE ); + setOffset( xOffs, val, false ); tFlags |= Tbl_snapToVGrid; // turn on snapping again } else { - setOffset( xOffs, val, FALSE ); + setOffset( xOffs, val, false ); } } @@ -1228,7 +1228,7 @@ void QtTableView::verSbSlidingDone( ) { if ( testTableFlags(Tbl_snapToVGrid) && testTableFlags(Tbl_smoothVScrolling) ) - snapToGrid( FALSE, TRUE ); + snapToGrid( false, true ); } @@ -1279,7 +1279,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) TQPainter paint( this ); - if ( !contentsRect().contains( updateR, TRUE ) ) {// update frame ? + if ( !contentsRect().contains( updateR, true ) ) {// update frame ? drawFrame( &paint ); if ( updateR.left() < frameWidth() ) //### updateR.setLeft( frameWidth() ); @@ -1345,7 +1345,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); - paint.setClipping( FALSE ); + paint.setClipping( false ); } else { paintCell( &paint, row, col ); } @@ -1357,7 +1357,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) frameWidth() > 0 && !winR.contains( cellR ) ) { //##arnt paint.setClipRect( cellUR ); paintCell( &paint, row, col ); - paint.setClipping( FALSE ); + paint.setClipping( false ); } else { paintCell( &paint, row, col ); } @@ -1378,7 +1378,7 @@ void QtTableView::paintEvent( TQPaintEvent *e ) // Note that this needs to be done regardless whether we do // eraseInPaint or not. Reason: a subclass may implement - // flicker-freeness and encourage the use of repaint(FALSE). + // flicker-freeness and encourage the use of repaint(false). // The subclass, however, cannot draw all pixels, just those // inside the cells. So QtTableView is reponsible for all pixels // outside the cells. @@ -1449,14 +1449,14 @@ TQScrollBar *QtTableView::verticalScrollBar() const #endif sb->resize( sb->sizeHint() ); // height is irrelevant TQ_CHECK_PTR(sb); - sb->setTracking( FALSE ); + sb->setTracking( false ); sb->setFocusPolicy( TQWidget::NoFocus ); - connect( sb, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(verSbValue(int))); - connect( sb, TQT_SIGNAL(sliderMoved(int)), - TQT_SLOT(verSbSliding(int))); - connect( sb, TQT_SIGNAL(sliderReleased()), - TQT_SLOT(verSbSlidingDone())); + connect( sb, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(verSbValue(int))); + connect( sb, TQ_SIGNAL(sliderMoved(int)), + TQ_SLOT(verSbSliding(int))); + connect( sb, TQ_SIGNAL(sliderReleased()), + TQ_SLOT(verSbSlidingDone())); sb->hide(); that->vScrollBar = sb; return sb; @@ -1481,13 +1481,13 @@ TQScrollBar *QtTableView::horizontalScrollBar() const sb->resize( sb->sizeHint() ); // width is irrelevant sb->setFocusPolicy( TQWidget::NoFocus ); TQ_CHECK_PTR(sb); - sb->setTracking( FALSE ); - connect( sb, TQT_SIGNAL(valueChanged(int)), - TQT_SLOT(horSbValue(int))); - connect( sb, TQT_SIGNAL(sliderMoved(int)), - TQT_SLOT(horSbSliding(int))); - connect( sb, TQT_SIGNAL(sliderReleased()), - TQT_SLOT(horSbSlidingDone())); + sb->setTracking( false ); + connect( sb, TQ_SIGNAL(valueChanged(int)), + TQ_SLOT(horSbValue(int))); + connect( sb, TQ_SIGNAL(sliderMoved(int)), + TQ_SLOT(horSbSliding(int))); + connect( sb, TQ_SIGNAL(sliderReleased()), + TQ_SLOT(horSbSlidingDone())); sb->hide(); that->hScrollBar = sb; return sb; @@ -1510,14 +1510,14 @@ void QtTableView::setHorScrollBar( bool on, bool update ) else sbDirty = sbDirty | (horMask | verMask); if ( testTableFlags( Tbl_vScrollBar ) ) - coverCornerSquare( TRUE ); + coverCornerSquare( true ); if ( autoUpdate() ) sbDirty = sbDirty | horMask; } else { tFlags &= ~Tbl_hScrollBar; if ( !hScrollBar ) return; - coverCornerSquare( FALSE ); + coverCornerSquare( false ); bool hideScrollBar = autoUpdate() && hScrollBar->isVisible(); if ( hideScrollBar ) hScrollBar->hide(); @@ -1549,14 +1549,14 @@ void QtTableView::setVerScrollBar( bool on, bool update ) else sbDirty = sbDirty | (horMask | verMask); if ( testTableFlags( Tbl_hScrollBar ) ) - coverCornerSquare( TRUE ); + coverCornerSquare( true ); if ( autoUpdate() ) sbDirty = sbDirty | verMask; } else { tFlags &= ~Tbl_vScrollBar; if ( !vScrollBar ) return; - coverCornerSquare( FALSE ); + coverCornerSquare( false ); bool hideScrollBar = autoUpdate() && vScrollBar->isVisible(); if ( hideScrollBar ) vScrollBar->hide(); @@ -1711,8 +1711,8 @@ int QtTableView::findCol( int xPos ) const /*! Computes the position in the widget of row \a row. - Returns TRUE and stores the result in \a *yPos (in \e widget - coordinates) if the row is visible. Returns FALSE and does not modify + Returns true and stores the result in \a *yPos (in \e widget + coordinates) if the row is visible. Returns false and does not modify \a *yPos if \a row is invisible or invalid. \sa colXPos(), findRow() @@ -1725,7 +1725,7 @@ bool QtTableView::rowYPos( int row, int *yPos ) const if ( cellH ) { int lastVisible = lastRowVisible(); if ( row > lastVisible || lastVisible == -1 ) - return FALSE; + return false; y = (row - yCellOffs)*cellH + minViewY() - yCellDelta; } else { //##arnt3 @@ -1736,23 +1736,23 @@ bool QtTableView::rowYPos( int row, int *yPos ) const while ( r < row && y <= maxY ) y += tw->cellHeight( r++ ); if ( y > maxY ) - return FALSE; + return false; } } else { - return FALSE; + return false; } if ( yPos ) *yPos = y; - return TRUE; + return true; } /*! Computes the position in the widget of column \a col. - Returns TRUE and stores the result in \a *xPos (in \e widget - coordinates) if the column is visible. Returns FALSE and does not + Returns true and stores the result in \a *xPos (in \e widget + coordinates) if the column is visible. Returns false and does not modify \a *xPos if \a col is invisible or invalid. \sa rowYPos(), findCol() @@ -1765,7 +1765,7 @@ bool QtTableView::colXPos( int col, int *xPos ) const if ( cellW ) { int lastVisible = lastColVisible(); if ( col > lastVisible || lastVisible == -1 ) - return FALSE; + return false; x = (col - xCellOffs)*cellW + minViewX() - xCellDelta; } else { //##arnt3 @@ -1776,14 +1776,14 @@ bool QtTableView::colXPos( int col, int *xPos ) const while ( c < col && x <= maxX ) x += tw->cellWidth( c++ ); if ( x > maxX ) - return FALSE; + return false; } } else { - return FALSE; + return false; } if ( xPos ) *xPos = x; - return TRUE; + return true; } @@ -1912,9 +1912,9 @@ void QtTableView::doAutoScrollBars() w += cellWidth( i++ ); } if ( w > viewW ) - hScrollOn = TRUE; + hScrollOn = true; else - hScrollOn = FALSE; + hScrollOn = false; } if ( testTableFlags(Tbl_autoVScrollBar) ) { @@ -1927,21 +1927,21 @@ void QtTableView::doAutoScrollBars() } if ( h > viewH ) - vScrollOn = TRUE; + vScrollOn = true; else - vScrollOn = FALSE; + vScrollOn = false; } if ( testTableFlags(Tbl_autoHScrollBar) && vScrollOn && !hScrollOn ) if ( w > viewW - VSBEXT ) - hScrollOn = TRUE; + hScrollOn = true; if ( testTableFlags(Tbl_autoVScrollBar) && hScrollOn && !vScrollOn ) if ( h > viewH - HSBEXT ) - vScrollOn = TRUE; + vScrollOn = true; - setHorScrollBar( hScrollOn, FALSE ); - setVerScrollBar( vScrollOn, FALSE ); + setHorScrollBar( hScrollOn, false ); + setVerScrollBar( vScrollOn, false ); updateFrameSize(); } @@ -1967,7 +1967,7 @@ void QtTableView::updateScrollBars( uint f ) sbDirty = sbDirty | f; if ( inSbUpdate ) return; - inSbUpdate = TRUE; + inSbUpdate = true; if ( testTableFlags(Tbl_autoHScrollBar) && (sbDirty & horRange) || testTableFlags(Tbl_autoVScrollBar) && (sbDirty & verRange) ) @@ -1975,7 +1975,7 @@ void QtTableView::updateScrollBars( uint f ) doAutoScrollBars(); // turn scroll bars on/off if needed if ( !autoUpdate() ) { - inSbUpdate = FALSE; + inSbUpdate = false; return; } if ( yOffset() > 0 && testTableFlags( Tbl_autoVScrollBar ) && @@ -1987,7 +1987,7 @@ void QtTableView::updateScrollBars( uint f ) setXOffset( 0 ); } if ( !isVisible() ) { - inSbUpdate = FALSE; + inSbUpdate = false; return; } @@ -2044,7 +2044,7 @@ void QtTableView::updateScrollBars( uint f ) maxViewY() + frameWidth() + 1 ); sbDirty = 0; - inSbUpdate = FALSE; + inSbUpdate = false; } @@ -2263,10 +2263,10 @@ void QtTableView::showOrHideScrollBars() void QtTableView::updateTableSize() { bool updateOn = autoUpdate(); - setAutoUpdate( FALSE ); + setAutoUpdate( false ); int xofs = xOffset(); xOffs++; //so that setOffset will not return immediately - setOffset(xofs,yOffset(),FALSE); //to calculate internal state correctly + setOffset(xofs,yOffset(),false); //to calculate internal state correctly setAutoUpdate(updateOn); updateScrollBars( horSteps | horRange | diff --git a/cervisia/qttableview.h b/cervisia/qttableview.h index df85cd71..c911dca2 100644 --- a/cervisia/qttableview.h +++ b/cervisia/qttableview.h @@ -32,9 +32,9 @@ public: virtual void setPalette( const TQPalette & ); void show(); - void repaint( bool erase=TRUE ); - void repaint( int x, int y, int w, int h, bool erase=TRUE ); - void repaint( const TQRect &, bool erase=TRUE ); + void repaint( bool erase=true ); + void repaint( int x, int y, int w, int h, bool erase=true ); + void repaint( const TQRect &, bool erase=true ); protected: QtTableView( TQWidget *parent=0, const char *name=0, WFlags f=0 ); @@ -55,7 +55,7 @@ protected: virtual void setXOffset( int ); int yOffset() const; virtual void setYOffset( int ); - virtual void setOffset( int x, int y, bool updateScrBars = TRUE ); + virtual void setOffset( int x, int y, bool updateScrBars = true ); virtual int cellWidth( int col ); virtual int cellHeight( int row ); @@ -75,7 +75,7 @@ protected: bool autoUpdate() const; virtual void setAutoUpdate( bool ); - void updateCell( int row, int column, bool erase=TRUE ); + void updateCell( int row, int column, bool erase=true ); TQRect cellUpdateRect() const; TQRect viewRect() const; @@ -130,13 +130,13 @@ protected: private: void coverCornerSquare( bool ); void snapToGrid( bool horizontal, bool vertical ); - virtual void setHorScrollBar( bool on, bool update = TRUE ); - virtual void setVerScrollBar( bool on, bool update = TRUE ); + virtual void setHorScrollBar( bool on, bool update = true ); + virtual void setVerScrollBar( bool on, bool update = true ); void updateView(); int findRawRow( int yPos, int *cellMaxY, int *cellMinY = 0, - bool goOutsideView = FALSE ) const; + bool goOutsideView = false ) const; int findRawCol( int xPos, int *cellMaxX, int *cellMinX = 0, - bool goOutsideView = FALSE ) const; + bool goOutsideView = false ) const; int maxColsVisible() const; void updateScrollBars( uint ); diff --git a/cervisia/repositorydlg.cpp b/cervisia/repositorydlg.cpp index 60a35257..8171b9df 100644 --- a/cervisia/repositorydlg.cpp +++ b/cervisia/repositorydlg.cpp @@ -173,10 +173,10 @@ RepositoryDialog::RepositoryDialog(TDEConfig& cfg, CvsService_stub* cvsService, m_repoList->addColumn(i18n("Status")); m_repoList->setFocus(); - connect(m_repoList, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(slotDoubleClicked(TQListViewItem*))); - connect(m_repoList, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(slotSelectionChanged())); + connect(m_repoList, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(slotDoubleClicked(TQListViewItem*))); + connect(m_repoList, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(slotSelectionChanged())); KButtonBox* actionbox = new KButtonBox(mainWidget, TQt::Vertical); TQPushButton* addbutton = actionbox->addButton(i18n("&Add...")); @@ -192,16 +192,16 @@ RepositoryDialog::RepositoryDialog(TDEConfig& cfg, CvsService_stub* cvsService, m_loginButton->setEnabled(false); m_logoutButton->setEnabled(false); - connect( addbutton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotAddClicked()) ); - connect( m_modifyButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotModifyClicked()) ); - connect( m_removeButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotRemoveClicked()) ); - connect( m_loginButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLoginClicked()) ); - connect( m_logoutButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotLogoutClicked()) ); + connect( addbutton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotAddClicked()) ); + connect( m_modifyButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotModifyClicked()) ); + connect( m_removeButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotRemoveClicked()) ); + connect( m_loginButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLoginClicked()) ); + connect( m_logoutButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotLogoutClicked()) ); // open cvs DCOP service configuration file m_serviceConfig = new TDEConfig("cvsservicerc"); diff --git a/cervisia/resolvedlg.cpp b/cervisia/resolvedlg.cpp index ce3ce533..395b0636 100644 --- a/cervisia/resolvedlg.cpp +++ b/cervisia/resolvedlg.cpp @@ -143,28 +143,28 @@ ResolveDialog::ResolveDialog(TDEConfig& cfg, TQWidget *parent, const char *name) layout->addWidget(vertSplitter); abutton = new TQPushButton("&A", mainWidget); - connect( abutton, TQT_SIGNAL(clicked()), TQT_SLOT(aClicked()) ); + connect( abutton, TQ_SIGNAL(clicked()), TQ_SLOT(aClicked()) ); bbutton = new TQPushButton("&B", mainWidget); - connect( bbutton, TQT_SIGNAL(clicked()), TQT_SLOT(bClicked()) ); + connect( bbutton, TQ_SIGNAL(clicked()), TQ_SLOT(bClicked()) ); abbutton = new TQPushButton("A+B", mainWidget); - connect( abbutton, TQT_SIGNAL(clicked()), TQT_SLOT(abClicked()) ); + connect( abbutton, TQ_SIGNAL(clicked()), TQ_SLOT(abClicked()) ); babutton = new TQPushButton("B+A", mainWidget); - connect( babutton, TQT_SIGNAL(clicked()), TQT_SLOT(baClicked()) ); + connect( babutton, TQ_SIGNAL(clicked()), TQ_SLOT(baClicked()) ); editbutton = new TQPushButton(i18n("&Edit"), mainWidget); - connect( editbutton, TQT_SIGNAL(clicked()), TQT_SLOT(editClicked()) ); + connect( editbutton, TQ_SIGNAL(clicked()), TQ_SLOT(editClicked()) ); nofnlabel = new TQLabel(mainWidget); nofnlabel->setAlignment(AlignCenter); backbutton = new TQPushButton("&<<", mainWidget); - connect( backbutton, TQT_SIGNAL(clicked()), TQT_SLOT(backClicked()) ); + connect( backbutton, TQ_SIGNAL(clicked()), TQ_SLOT(backClicked()) ); forwbutton = new TQPushButton("&>>", mainWidget); - connect( forwbutton, TQT_SIGNAL(clicked()), TQT_SLOT(forwClicked()) ); + connect( forwbutton, TQ_SIGNAL(clicked()), TQ_SLOT(forwClicked()) ); TQBoxLayout *buttonlayout = new TQHBoxLayout(layout); buttonlayout->addWidget(abutton, 1); @@ -178,8 +178,8 @@ ResolveDialog::ResolveDialog(TDEConfig& cfg, TQWidget *parent, const char *name) buttonlayout->addWidget(backbutton, 1); buttonlayout->addWidget(forwbutton, 1); - connect( this, TQT_SIGNAL(user2Clicked()), TQT_SLOT(saveClicked()) ); - connect( this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(saveAsClicked()) ); + connect( this, TQ_SIGNAL(user2Clicked()), TQ_SLOT(saveClicked()) ); + connect( this, TQ_SIGNAL(user1Clicked()), TQ_SLOT(saveAsClicked()) ); TQFontMetrics const fm(fontMetrics()); setMinimumSize(fm.width('0') * 120, diff --git a/cervisia/settingsdlg.cpp b/cervisia/settingsdlg.cpp index 33f0b935..c6ecd33f 100644 --- a/cervisia/settingsdlg.cpp +++ b/cervisia/settingsdlg.cpp @@ -61,7 +61,7 @@ namespace FontButton::FontButton( const TQString &text, TQWidget *parent, const char *name ) : TQPushButton(text, parent, name) { - connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(chooseFont()) ); + connect( this, TQ_SIGNAL(clicked()), this, TQ_SLOT(chooseFont()) ); } diff --git a/cervisia/tagdlg.cpp b/cervisia/tagdlg.cpp index 65c0915a..2df98f29 100644 --- a/cervisia/tagdlg.cpp +++ b/cervisia/tagdlg.cpp @@ -58,8 +58,8 @@ TagDialog::TagDialog(ActionType action, CvsService_stub* service, TQLabel *tag_label = new TQLabel(tag_combo, i18n("&Name of tag:"), mainWidget); TQPushButton *tag_button = new TQPushButton(i18n("Fetch &List"), mainWidget); - connect( tag_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(tagButtonClicked()) ); + connect( tag_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(tagButtonClicked()) ); TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout); tagedit_layout->addWidget(tag_label); diff --git a/cervisia/updatedlg.cpp b/cervisia/updatedlg.cpp index 4b9b2a0c..9ae04cbb 100644 --- a/cervisia/updatedlg.cpp +++ b/cervisia/updatedlg.cpp @@ -54,8 +54,8 @@ UpdateDialog::UpdateDialog(CvsService_stub* service, branch_combo->setMinimumWidth(iComboBoxMinWidth); branch_button = new TQPushButton(i18n("Fetch &List"), mainWidget); - connect( branch_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(branchButtonClicked()) ); + connect( branch_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(branchButtonClicked()) ); TQBoxLayout *branchedit_layout = new TQHBoxLayout(layout); branchedit_layout->addSpacing(iWidgetIndent); @@ -69,8 +69,8 @@ UpdateDialog::UpdateDialog(CvsService_stub* service, tag_combo->setMinimumWidth(iComboBoxMinWidth); tag_button = new TQPushButton(i18n("Fetch L&ist"), mainWidget); - connect( tag_button, TQT_SIGNAL(clicked()), - this, TQT_SLOT(tagButtonClicked()) ); + connect( tag_button, TQ_SIGNAL(clicked()), + this, TQ_SLOT(tagButtonClicked()) ); TQBoxLayout *tagedit_layout = new TQHBoxLayout(layout); tagedit_layout->addSpacing(iWidgetIndent); @@ -91,8 +91,8 @@ UpdateDialog::UpdateDialog(CvsService_stub* service, group->insert(bytag_button); group->insert(bybranch_button); group->insert(bydate_button); - connect( group, TQT_SIGNAL(clicked(int)), - this, TQT_SLOT(toggled()) ); + connect( group, TQ_SIGNAL(clicked(int)), + this, TQ_SLOT(toggled()) ); // dis-/enable the widgets toggled(); diff --git a/cervisia/updateview.cpp b/cervisia/updateview.cpp index 4c6d6e37..3c119b92 100644 --- a/cervisia/updateview.cpp +++ b/cervisia/updateview.cpp @@ -56,10 +56,10 @@ UpdateView::UpdateView(TDEConfig& partConfig, TQWidget *parent, const char *name setFilter(NoFilter); - connect( this, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(itemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(itemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(itemExecuted(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(itemExecuted(TQListViewItem*)) ); // without this restoreLayout() can't change the column widths for (int col = 0; col < columns(); ++col) diff --git a/cervisia/watchdlg.cpp b/cervisia/watchdlg.cpp index a835c0f8..d11bb0bc 100644 --- a/cervisia/watchdlg.cpp +++ b/cervisia/watchdlg.cpp @@ -73,12 +73,12 @@ WatchDialog::WatchDialog(ActionType action, TQWidget *parent, const char *name) group->insert(all_button); group->insert(only_button); - connect( only_button, TQT_SIGNAL(toggled(bool)), - commitbox, TQT_SLOT(setEnabled(bool)) ); - connect( only_button, TQT_SIGNAL(toggled(bool)), - editbox, TQT_SLOT(setEnabled(bool)) ); - connect( only_button, TQT_SIGNAL(toggled(bool)), - uneditbox, TQT_SLOT(setEnabled(bool)) ); + connect( only_button, TQ_SIGNAL(toggled(bool)), + commitbox, TQ_SLOT(setEnabled(bool)) ); + connect( only_button, TQ_SIGNAL(toggled(bool)), + editbox, TQ_SLOT(setEnabled(bool)) ); + connect( only_button, TQ_SIGNAL(toggled(bool)), + uneditbox, TQ_SLOT(setEnabled(bool)) ); setHelp("watches"); } diff --git a/doc/kompare/index.docbook b/doc/kompare/index.docbook index 074859e0..9cdad65d 100644 --- a/doc/kompare/index.docbook +++ b/doc/kompare/index.docbook @@ -876,7 +876,7 @@ Documentation Copyright © 2007 Sean Wheller <email>sean@inwords.co.za</emai <appendix id="installation"> <title>Installation</title> -<sect1 id="getting-kapp"> +<sect1 id="getting-tdeApp"> <title>How to obtain &kompare;</title> &install.intro.documentation; diff --git a/doc/man/cervisia/CMakeLists.txt b/doc/man/cervisia/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/cervisia/CMakeLists.txt +++ b/doc/man/cervisia/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kapptemplate/CMakeLists.txt b/doc/man/kapptemplate/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kapptemplate/CMakeLists.txt +++ b/doc/man/kapptemplate/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kbabel/CMakeLists.txt b/doc/man/kbabel/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kbabel/CMakeLists.txt +++ b/doc/man/kbabel/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kbugbuster/CMakeLists.txt b/doc/man/kbugbuster/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kbugbuster/CMakeLists.txt +++ b/doc/man/kbugbuster/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kmtrace/CMakeLists.txt b/doc/man/kmtrace/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kmtrace/CMakeLists.txt +++ b/doc/man/kmtrace/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kompare/CMakeLists.txt b/doc/man/kompare/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kompare/CMakeLists.txt +++ b/doc/man/kompare/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kspy/CMakeLists.txt b/doc/man/kspy/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kspy/CMakeLists.txt +++ b/doc/man/kspy/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/kuiviewer/CMakeLists.txt b/doc/man/kuiviewer/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/kuiviewer/CMakeLists.txt +++ b/doc/man/kuiviewer/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/poxml/CMakeLists.txt b/doc/man/poxml/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/poxml/CMakeLists.txt +++ b/doc/man/poxml/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/scripts/CMakeLists.txt b/doc/man/scripts/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/scripts/CMakeLists.txt +++ b/doc/man/scripts/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/tdecachegrind/CMakeLists.txt b/doc/man/tdecachegrind/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/tdecachegrind/CMakeLists.txt +++ b/doc/man/tdecachegrind/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/doc/man/umbrello/CMakeLists.txt b/doc/man/umbrello/CMakeLists.txt index 24ccd704..65c83b94 100644 --- a/doc/man/umbrello/CMakeLists.txt +++ b/doc/man/umbrello/CMakeLists.txt @@ -1,6 +1,6 @@ file( GLOB _man_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.1 ) -INSTALL( +install( FILES ${_man_files} DESTINATION ${MAN_INSTALL_DIR}/man1 COMPONENT doc diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp index e3280254..fb7a2a97 100644 --- a/kapptemplate/kapp/app.cpp +++ b/kapptemplate/kapp/app.cpp @@ -51,10 +51,10 @@ ${APP_NAME}::${APP_NAME}() setupGUI(); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - this, TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - this, TQT_SLOT(changeCaption(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); } @@ -91,19 +91,19 @@ void ${APP_NAME}::load(const KURL& url) void ${APP_NAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::save(this, TQT_SLOT(fileSave()), actionCollection()); - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::print(this, TQT_SLOT(filePrint()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::print(this, TQ_SLOT(filePrint()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, - this, TQT_SLOT(optionsPreferences()), + this, TQ_SLOT(optionsPreferences()), actionCollection(), "custom_action"); } @@ -226,7 +226,7 @@ void ${APP_NAME}::optionsConfigureToolbars() // use the standard toolbar editor saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), this, TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig())); dlg.exec(); } diff --git a/kapptemplate/kapp/appview.cpp b/kapptemplate/kapp/appview.cpp index d2299c22..d4075223 100644 --- a/kapptemplate/kapp/appview.cpp +++ b/kapptemplate/kapp/appview.cpp @@ -62,10 +62,10 @@ ${APP_NAME}View::${APP_NAME}View(TQWidget *parent) return; } - connect(m_html, TQT_SIGNAL(setWindowCaption(const TQString&)), - this, TQT_SLOT(slotSetTitle(const TQString&))); - connect(m_html, TQT_SIGNAL(setStatusBarText(const TQString&)), - this, TQT_SLOT(slotOnURL(const TQString&))); + connect(m_html, TQ_SIGNAL(setWindowCaption(const TQString&)), + this, TQ_SLOT(slotSetTitle(const TQString&))); + connect(m_html, TQ_SIGNAL(setStatusBarText(const TQString&)), + this, TQ_SLOT(slotOnURL(const TQString&))); } diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp index 85fb8dc5..e95dfba2 100644 --- a/kapptemplate/kpartapp/app.cpp +++ b/kapptemplate/kpartapp/app.cpp @@ -56,8 +56,8 @@ ${APP_NAME}::${APP_NAME}() // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful KMessageBox::error(this, "Could not find our Part!"); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -79,16 +79,16 @@ void ${APP_NAME}::load(const KURL& url) void ${APP_NAME}::setupActions() { - KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); - KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); + KStdAction::openNew(this, TQ_SLOT(fileNew()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void ${APP_NAME}::saveProperties(TDEConfig* /*config*/) @@ -136,8 +136,8 @@ void ${APP_NAME}::optionsConfigureToolbars() // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), - this, TQT_SLOT(applyNewToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), + this, TQ_SLOT(applyNewToolbarConfig())); dlg.exec(); } diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp index ee1a90e5..95412264 100644 --- a/kapptemplate/kpartapp/app_part.cpp +++ b/kapptemplate/kpartapp/app_part.cpp @@ -4,7 +4,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp #include "${APP_NAME_LC}_part.moc" -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaction.h> #include <kstdaction.h> #include <tdefiledialog.h> @@ -32,8 +32,8 @@ ${APP_NAME}Part::${APP_NAME}Part( TQWidget *parentWidget, const char *widgetName setWidget(m_widget); // create our actions - KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); - KStdAction::save(this, TQT_SLOT(save()), actionCollection()); + KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + KStdAction::save(this, TQ_SLOT(save()), actionCollection()); // set our XML-UI resource file setXMLFile("${APP_NAME_LC}_part.rc"); @@ -54,12 +54,12 @@ void ${APP_NAME}Part::setReadWrite(bool rw) // notify your internal widget of the read-write state m_widget->setReadOnly(!rw); if (rw) - connect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + connect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); else { - disconnect(m_widget, TQT_SIGNAL(textChanged()), - this, TQT_SLOT(setModified())); + disconnect(m_widget, TQ_SIGNAL(textChanged()), + this, TQ_SLOT(setModified())); } ReadWritePart::setReadWrite(rw); diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp index 0bebbb39..7ae38c3e 100644 --- a/kapptemplate/kpartplugin/plugin_app.cpp +++ b/kapptemplate/kpartplugin/plugin_app.cpp @@ -4,7 +4,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp #include <tdehtml_part.h> #include <tdeaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdemessagebox.h> #include <tdelocale.h> #include <kgenericfactory.h> @@ -20,7 +20,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 TDEAction( i18n("&Plugin Action"), "${APP_NAME_LC}", 0, - this, TQT_SLOT(slotAction()), + this, TQ_SLOT(slotAction()), actionCollection(), "plugin_action" ); } diff --git a/kbabel/addons/preview/pothumbcreator.cpp b/kbabel/addons/preview/pothumbcreator.cpp index 8efd135f..c3d57c66 100644 --- a/kbabel/addons/preview/pothumbcreator.cpp +++ b/kbabel/addons/preview/pothumbcreator.cpp @@ -40,7 +40,7 @@ #include <tdeapplication.h> #include <tdeglobal.h> #include <kiconloader.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kpixmapsplitter.h> #include "pothumbcreator.h" @@ -50,7 +50,7 @@ using namespace KBabel; extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { return new PoThumbCreator; } diff --git a/kbabel/catalogmanager/catalogmanager.cpp b/kbabel/catalogmanager/catalogmanager.cpp index ceed6ce2..4ef617c1 100644 --- a/kbabel/catalogmanager/catalogmanager.cpp +++ b/kbabel/catalogmanager/catalogmanager.cpp @@ -67,7 +67,7 @@ #include <kprogress.h> #include <tdestdaccel.h> #include <kstdaction.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <tdetoolbar.h> #include <twin.h> @@ -115,7 +115,7 @@ void CatalogManager::init() _foundFilesList.clear(); _toBeSearched.clear(); _timerFind = new TQTimer( this ); - connect(_timerFind, TQT_SIGNAL( timeout() ), TQT_TQOBJECT(this), TQT_SLOT(findNextFile()) ); + connect(_timerFind, TQ_SIGNAL( timeout() ), this, TQ_SLOT(findNextFile()) ); _searchStopped = false; _prefDialog=0; @@ -132,8 +132,8 @@ void CatalogManager::init() _project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); } - connect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) - , TQT_TQOBJECT(this), TQT_SLOT (updateSettings())); + connect( _project, TQ_SIGNAL (signalCatManSettingsChanged()) + , this, TQ_SLOT (updateSettings())); TQWidget *view = new TQWidget(this); TQVBoxLayout* layout= new TQVBoxLayout(view); @@ -144,20 +144,20 @@ void CatalogManager::init() layout->addWidget(_catalogManager); layout->setStretchFactor(_catalogManager,1); - connect(this,TQT_SIGNAL(settingsChanged(KBabel::CatManSettings)) - ,TQT_TQOBJECT(_catalogManager),TQT_SLOT(setSettings(KBabel::CatManSettings))); - connect(_catalogManager,TQT_SIGNAL(openFile(TQString,TQString)) - ,this,TQT_SLOT(openFile(TQString,TQString))); - connect(_catalogManager,TQT_SIGNAL(openFileInNewWindow(TQString,TQString)) - ,this,TQT_SLOT(openFileInNewWindow(TQString,TQString))); - connect(_catalogManager,TQT_SIGNAL(openTemplate(TQString,TQString,TQString)) - ,this,TQT_SLOT(openTemplate(TQString,TQString,TQString))); - connect(_catalogManager,TQT_SIGNAL(openTemplateInNewWindow(TQString,TQString,TQString)) - ,this,TQT_SLOT(openTemplateInNewWindow(TQString,TQString,TQString))); - connect(_catalogManager,TQT_SIGNAL(gotoFileEntry(TQString,TQString,int)) - ,this,TQT_SLOT(openFile(TQString,TQString,int))); - connect(_catalogManager, TQT_SIGNAL(selectedChanged(uint)), - TQT_TQOBJECT(this), TQT_SLOT(selectedChanged(uint))); + connect(this,TQ_SIGNAL(settingsChanged(KBabel::CatManSettings)) + ,_catalogManager,TQ_SLOT(setSettings(KBabel::CatManSettings))); + connect(_catalogManager,TQ_SIGNAL(openFile(TQString,TQString)) + ,this,TQ_SLOT(openFile(TQString,TQString))); + connect(_catalogManager,TQ_SIGNAL(openFileInNewWindow(TQString,TQString)) + ,this,TQ_SLOT(openFileInNewWindow(TQString,TQString))); + connect(_catalogManager,TQ_SIGNAL(openTemplate(TQString,TQString,TQString)) + ,this,TQ_SLOT(openTemplate(TQString,TQString,TQString))); + connect(_catalogManager,TQ_SIGNAL(openTemplateInNewWindow(TQString,TQString,TQString)) + ,this,TQ_SLOT(openTemplateInNewWindow(TQString,TQString,TQString))); + connect(_catalogManager,TQ_SIGNAL(gotoFileEntry(TQString,TQString,int)) + ,this,TQ_SLOT(openFile(TQString,TQString,int))); + connect(_catalogManager, TQ_SIGNAL(selectedChanged(uint)), + this, TQ_SLOT(selectedChanged(uint))); KWin::setIcons(winId(),BarIcon("catalogmanager",32) ,SmallIcon("catalogmanager")); @@ -172,20 +172,20 @@ void CatalogManager::init() _progressLabel->hide(); _progressBar->hide(); - connect(_catalogManager,TQT_SIGNAL(prepareProgressBar(TQString,int)) - , TQT_TQOBJECT(this), TQT_SLOT(prepareProgressBar(TQString,int))); - connect(_catalogManager,TQT_SIGNAL(clearProgressBar()) - , TQT_TQOBJECT(this), TQT_SLOT(clearProgressBar())); - connect(_catalogManager,TQT_SIGNAL(progress(int)) - , _progressBar, TQT_SLOT(setProgress(int))); -// connect(_catalogManager, TQT_SIGNAL(signalBuildTree(bool)) -// , TQT_TQOBJECT(this), TQT_SLOT(enableMenuForFiles(bool))); - connect(_catalogManager, TQT_SIGNAL(signalBuildTree(bool)) - , TQT_TQOBJECT(this), TQT_SLOT(enableActions(bool))); - connect(this, TQT_SIGNAL(searchStopped()) - , TQT_TQOBJECT(_catalogManager), TQT_SLOT(stopSearch())); - connect(_catalogManager, TQT_SIGNAL(prepareFindProgressBar(int)) - , TQT_TQOBJECT(this), TQT_SLOT(prepareStatusProgressBar(int))); + connect(_catalogManager,TQ_SIGNAL(prepareProgressBar(TQString,int)) + , this, TQ_SLOT(prepareProgressBar(TQString,int))); + connect(_catalogManager,TQ_SIGNAL(clearProgressBar()) + , this, TQ_SLOT(clearProgressBar())); + connect(_catalogManager,TQ_SIGNAL(progress(int)) + , _progressBar, TQ_SLOT(setProgress(int))); +// connect(_catalogManager, TQ_SIGNAL(signalBuildTree(bool)) +// , this, TQ_SLOT(enableMenuForFiles(bool))); + connect(_catalogManager, TQ_SIGNAL(signalBuildTree(bool)) + , this, TQ_SLOT(enableActions(bool))); + connect(this, TQ_SIGNAL(searchStopped()) + , _catalogManager, TQ_SLOT(stopSearch())); + connect(_catalogManager, TQ_SIGNAL(prepareFindProgressBar(int)) + , this, TQ_SLOT(prepareStatusProgressBar(int))); setCentralWidget(view); resize( 600,300); @@ -206,8 +206,8 @@ void CatalogManager::init() _catalogManager->setRMBMenuDir(popup); } - connect(_catalogManager, TQT_SIGNAL(signalSearchedFile(int)) - , _statusProgressBar, TQT_SLOT(advance(int))); + connect(_catalogManager, TQ_SIGNAL(signalSearchedFile(int)) + , _statusProgressBar, TQ_SLOT(advance(int))); restoreView(); } @@ -219,61 +219,61 @@ void CatalogManager::setupActions() TDEAction *action; // the file menu - action = new TDEAction( i18n("&Open"), CTRL+Key_O, TQT_TQOBJECT(_catalogManager), - TQT_SLOT(slotOpenFile()),actionCollection(), "open"); + action = new TDEAction( i18n("&Open"), CTRL+Key_O, _catalogManager, + TQ_SLOT(slotOpenFile()),actionCollection(), "open"); action->setEnabled(false); - action = new TDEAction(i18n("&Open Template"),Key_Space,TQT_TQOBJECT(_catalogManager), - TQT_SLOT(slotOpenTemplate()),actionCollection(), "open_template"); + action = new TDEAction(i18n("&Open Template"),Key_Space,_catalogManager, + TQ_SLOT(slotOpenTemplate()),actionCollection(), "open_template"); action->setEnabled(false); - action = new TDEAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,TQT_TQOBJECT(_catalogManager), - TQT_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window"); + action = new TDEAction(i18n("Open in &New Window"),CTRL+SHIFT+Key_O,_catalogManager, + TQ_SLOT(slotOpenFileInNewWindow()),actionCollection(), "open_new_window"); action->setEnabled(false); - action = KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT (closeAllWindows()), actionCollection()); + action = KStdAction::quit(tdeApp, TQ_SLOT (closeAllWindows()), actionCollection()); actionMap["open_template"] = NEEDS_POT; // the edit menu - action = new TDEAction( i18n("Fi&nd in Files..."), CTRL+Key_F, TQT_TQOBJECT(this), - TQT_SLOT(find()), actionCollection(), "find_in_files"); + action = new TDEAction( i18n("Fi&nd in Files..."), CTRL+Key_F, this, + TQ_SLOT(find()), actionCollection(), "find_in_files"); action->setEnabled(false); - action = new TDEAction( i18n("Re&place in Files..."), CTRL+Key_R, TQT_TQOBJECT(this), - TQT_SLOT(replace()), actionCollection(), "replace_in_files"); + action = new TDEAction( i18n("Re&place in Files..."), CTRL+Key_R, this, + TQ_SLOT(replace()), actionCollection(), "replace_in_files"); action->setEnabled(false); - action = new TDEAction( i18n("&Stop Searching"), "process-stop", Key_Escape, TQT_TQOBJECT(this), - TQT_SLOT(stopSearching()), actionCollection(), "stop_search"); + action = new TDEAction( i18n("&Stop Searching"), "process-stop", Key_Escape, this, + TQ_SLOT(stopSearching()), actionCollection(), "stop_search"); action->setEnabled(false); - action = new TDEAction( i18n("&Reload"), "reload", TDEStdAccel::reload(), TQT_TQOBJECT(_catalogManager), - TQT_SLOT(updateCurrent()), actionCollection(), "reload"); + action = new TDEAction( i18n("&Reload"), "reload", TDEStdAccel::reload(), _catalogManager, + TQ_SLOT(updateCurrent()), actionCollection(), "reload"); action->setEnabled(false); // the marking menu - action = new TDEAction( i18n("&Toggle Marking"), CTRL+Key_M, TQT_TQOBJECT(_catalogManager), - TQT_SLOT(toggleMark()), actionCollection(), "toggle_marking"); + action = new TDEAction( i18n("&Toggle Marking"), CTRL+Key_M, _catalogManager, + TQ_SLOT(toggleMark()), actionCollection(), "toggle_marking"); action->setEnabled(false); - action = new TDEAction( i18n("Remove Marking"), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT(slotClearMarksInDir()), actionCollection(), "remove_marking"); + action = new TDEAction( i18n("Remove Marking"), 0, _catalogManager, + TQ_SLOT(slotClearMarksInDir()), actionCollection(), "remove_marking"); action->setEnabled(false); - action = new TDEAction( i18n("Toggle All Markings"), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT(toggleAllMarks()), actionCollection(), "toggle_all_marking"); + action = new TDEAction( i18n("Toggle All Markings"), 0, _catalogManager, + TQ_SLOT(toggleAllMarks()), actionCollection(), "toggle_all_marking"); action->setEnabled(false); - action = new TDEAction( i18n("Remove All Markings"), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT(clearAllMarks()), actionCollection(), "remove_all_marking"); + action = new TDEAction( i18n("Remove All Markings"), 0, _catalogManager, + TQ_SLOT(clearAllMarks()), actionCollection(), "remove_all_marking"); action->setEnabled(false); - action = new TDEAction( i18n("Mark Modified Files"), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT(markModifiedFiles()), actionCollection(), "mark_modified_files"); + action = new TDEAction( i18n("Mark Modified Files"), 0, _catalogManager, + TQ_SLOT(markModifiedFiles()), actionCollection(), "mark_modified_files"); // fixme to enabling this when loading is done using updateFinished() signal action->setEnabled(true); - action = new TDEAction( i18n("&Load Markings..."), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT(loadMarks()), actionCollection(), "load_marking"); + action = new TDEAction( i18n("&Load Markings..."), 0, _catalogManager, + TQ_SLOT(loadMarks()), actionCollection(), "load_marking"); action->setEnabled(false); - action = new TDEAction( i18n("&Save Markings..."), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT(saveMarks()), actionCollection(), "save_marking"); + action = new TDEAction( i18n("&Save Markings..."), 0, _catalogManager, + TQ_SLOT(saveMarks()), actionCollection(), "save_marking"); action->setEnabled(false); - (void)new TDEAction(i18n("&Mark Files..."), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT(slotMarkPattern()), actionCollection(), "mark_pattern"); - (void)new TDEAction(i18n("&Unmark Files..."), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT(slotUnmarkPattern()), actionCollection(), "unmark_pattern"); + (void)new TDEAction(i18n("&Mark Files..."), 0, _catalogManager, + TQ_SLOT(slotMarkPattern()), actionCollection(), "mark_pattern"); + (void)new TDEAction(i18n("&Unmark Files..."), 0, _catalogManager, + TQ_SLOT(slotUnmarkPattern()), actionCollection(), "unmark_pattern"); actionMap["remove_marking"] = NEEDS_MARK; actionMap["remove_all_marking"] = NEEDS_MARK; @@ -282,102 +282,102 @@ void CatalogManager::setupActions() // go menu action = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated", ALT+Key_Next, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); + _catalogManager, TQ_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); action->setEnabled(false); action = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated", ALT+Key_Prior, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans"); + _catalogManager, TQ_SLOT(gotoPreviousUntranslated()),actionCollection(), "go_prev_untrans"); action->setEnabled(false); action = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", CTRL+Key_Next, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); + _catalogManager, TQ_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); action->setEnabled(false); action = new TDEAction(i18n("Pre&vious Fuzzy"), "prevfuzzy", CTRL+Key_Prior, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy"); + _catalogManager, TQ_SLOT(gotoPreviousFuzzy()),actionCollection(), "go_prev_fuzzy"); action->setEnabled(false); action = new TDEAction(i18n("N&ext Fuzzy or Untranslated"), "nextfuzzyuntrans", CTRL+SHIFT+Key_Next, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr"); + _catalogManager, TQ_SLOT(gotoNextFuzzyOrUntranslated()),actionCollection(), "go_next_fuzzyUntr"); action->setEnabled(false); action = new TDEAction(i18n("P&revious Fuzzy or Untranslated"), "prevfuzzyuntrans", CTRL+SHIFT+Key_Prior, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr"); + _catalogManager, TQ_SLOT(gotoPreviousFuzzyOrUntranslated()),actionCollection(), "go_prev_fuzzyUntr"); action->setEnabled(false); action = new TDEAction(i18n("Next Err&or"), "nexterror", ALT+SHIFT+Key_Next, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error"); + _catalogManager, TQ_SLOT(gotoNextError()),actionCollection(), "go_next_error"); action->setEnabled(false); action = new TDEAction(i18n("Previo&us Error"), "preverror", ALT+SHIFT+Key_Prior, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error"); + _catalogManager, TQ_SLOT(gotoPreviousError()),actionCollection(), "go_prev_error"); action->setEnabled(false); action = new TDEAction(i18n("Next Te&mplate Only"), "nexttemplate", CTRL+Key_Down, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template"); + _catalogManager, TQ_SLOT(gotoNextTemplate()),actionCollection(), "go_next_template"); action->setEnabled(false); action = new TDEAction(i18n("Previous Temp&late Only"), "prevtemplate", CTRL+Key_Up, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template"); + _catalogManager, TQ_SLOT(gotoPreviousTemplate()),actionCollection(), "go_prev_template"); action->setEnabled(false); action = new TDEAction(i18n("Next Tran&slation Exists"), "nextpo", ALT+Key_Down, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextPo()),actionCollection(), "go_next_po"); + _catalogManager, TQ_SLOT(gotoNextPo()),actionCollection(), "go_next_po"); action->setEnabled(false); action = new TDEAction(i18n("Previous Transl&ation Exists"), "prevpo", ALT+Key_Up, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po"); + _catalogManager, TQ_SLOT(gotoPreviousPo()),actionCollection(), "go_prev_po"); action->setEnabled(false); action = new TDEAction(i18n("Previous Marke&d"), "prevmarked", SHIFT+Key_Up, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked"); + _catalogManager, TQ_SLOT(gotoPreviousMarked()),actionCollection(), "go_prev_marked"); action->setEnabled(false); action = new TDEAction(i18n("Next &Marked"), "nextmarked", SHIFT+Key_Down, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked"); + _catalogManager, TQ_SLOT(gotoNextMarked()),actionCollection(), "go_next_marked"); action->setEnabled(false); // project menu // the project menu action = new TDEAction(i18n("&New..."), "document-new" - , TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection() + , this, TQ_SLOT(projectNew()),actionCollection() ,"project_new"); action = new TDEAction(i18n("&Open..."), "document-open" - , TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection() + , this, TQ_SLOT(projectOpen()),actionCollection() ,"project_open"); action = new TDEAction(i18n("C&lose"), "window-close" - , TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection() + , this, TQ_SLOT(projectClose()),actionCollection() ,"project_close"); action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() ); action = new TDEAction(i18n("&Configure..."), "configure" - , TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection() + , this, TQ_SLOT(projectConfigure()),actionCollection() ,"project_settings"); // tools menu action = new TDEAction( i18n("&Statistics"), "statistics", CTRL+Key_S, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(statistics()), actionCollection(), "statistics"); + _catalogManager, TQ_SLOT(statistics()), actionCollection(), "statistics"); action->setEnabled(false); action = new TDEAction( i18n("S&tatistics in Marked"), "statistics", CTRL+ALT+Key_S, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedStatistics()), actionCollection(), "statistics_marked"); + _catalogManager, TQ_SLOT(markedStatistics()), actionCollection(), "statistics_marked"); action->setEnabled(false); action = new TDEAction( i18n("Check S&yntax"), "syntax", CTRL+Key_Y, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(checkSyntax()), actionCollection(), "syntax"); + _catalogManager, TQ_SLOT(checkSyntax()), actionCollection(), "syntax"); action->setEnabled(false); action = new TDEAction( i18n("S&pell Check"), "tools-check-spelling", CTRL+Key_I, - TQT_TQOBJECT(this), TQT_SLOT(spellcheck()), actionCollection(), "tools-check-spelling"); + this, TQ_SLOT(spellcheck()), actionCollection(), "tools-check-spelling"); action->setEnabled(false); action = new TDEAction( i18n("Spell Check in &Marked"), "tools-check-spelling", CTRL+ALT+Key_I, - TQT_TQOBJECT(this), TQT_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked"); + this, TQ_SLOT(markedSpellcheck()), actionCollection(), "spellcheck_marked"); action->setEnabled(false); action = new TDEAction( i18n("&Rough Translation"), CTRL+Key_T, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(roughTranslation()), actionCollection(), "rough_translation"); + _catalogManager, TQ_SLOT(roughTranslation()), actionCollection(), "rough_translation"); action->setEnabled(false); action = new TDEAction( i18n("Rough Translation in M&arked"), CTRL+ALT+Key_T, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked"); + _catalogManager, TQ_SLOT(markedRoughTranslation()), actionCollection(), "rough_translation_marked"); action->setEnabled(false); action = new TDEAction( i18n("Mai&l"), "mail-send", CTRL+Key_A, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailFiles()), actionCollection(), "mail_file"); + _catalogManager, TQ_SLOT(mailFiles()), actionCollection(), "mail_file"); action->setEnabled(false); action = new TDEAction( i18n("Mail Mar&ked"), "mail-send", CTRL+ALT+Key_A, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked"); + _catalogManager, TQ_SLOT(mailMarkedFiles()), actionCollection(), "mail_file_marked"); action->setEnabled(false); action = new TDEAction( i18n("&Pack"), "application-x-tar", CTRL+Key_B, - TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageFiles()), actionCollection(), "package_file"); - action = new TDEAction( i18n("Pack &Marked"), "application-x-tar", CTRL+ALT+Key_B, TQT_TQOBJECT(_catalogManager), TQT_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked"); + _catalogManager, TQ_SLOT(packageFiles()), actionCollection(), "package_file"); + action = new TDEAction( i18n("Pack &Marked"), "application-x-tar", CTRL+ALT+Key_B, _catalogManager, TQ_SLOT(packageMarkedFiles()), actionCollection(), "package_file_marked"); action->setEnabled(false); actionMap["statistics_marked"] = NEEDS_DIR | NEEDS_MARK; @@ -393,7 +393,7 @@ void CatalogManager::setupActions() TQValueList<KDataToolInfo> tools = ToolAction::validationTools(); TQPtrList<TDEAction> actions = ToolAction::dataToolActionList( - tools, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString& )) + tools, _catalogManager, TQ_SLOT(validateUsingTool( const KDataToolInfo &, const TQString& )) ,"validate", false, actionCollection() ); TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(), @@ -407,7 +407,7 @@ void CatalogManager::setupActions() } actions = ToolAction::dataToolActionList( - tools, TQT_TQOBJECT(_catalogManager), TQT_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& )) + tools, _catalogManager, TQ_SLOT(validateMarkedUsingTool( const KDataToolInfo &, const TQString& )) ,"validate", false, actionCollection(), "marked_" ); m_menu = new TDEActionMenu(i18n("V&alidation Marked"), actionCollection(), "dynamic_validation_marked"); @@ -422,20 +422,20 @@ void CatalogManager::setupActions() // CVS submenu // Actions for PO files - (void)new TDEAction( i18n( "Update" ), "go-down", 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( cvsUpdate( ) ), actionCollection( ), "cvs_update" ); - (void)new TDEAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( cvsUpdateMarked( ) ), actionCollection( ), "cvs_update_marked" ); - (void)new TDEAction( i18n( "Commit" ), "go-up", 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" ); - (void)new TDEAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" ); - (void)new TDEAction( i18n( "Status" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" ); - (void)new TDEAction( i18n( "Status for Marked" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" ); - (void)new TDEAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" ); + (void)new TDEAction( i18n( "Update" ), "go-down", 0, _catalogManager, + TQ_SLOT( cvsUpdate( ) ), actionCollection( ), "cvs_update" ); + (void)new TDEAction( i18n( "Update Marked" ), 0, _catalogManager, + TQ_SLOT( cvsUpdateMarked( ) ), actionCollection( ), "cvs_update_marked" ); + (void)new TDEAction( i18n( "Commit" ), "go-up", 0, _catalogManager, + TQ_SLOT( cvsCommit( ) ), actionCollection( ), "cvs_commit" ); + (void)new TDEAction( i18n( "Commit Marked" ), 0, _catalogManager, + TQ_SLOT( cvsCommitMarked( ) ), actionCollection( ), "cvs_commit_marked" ); + (void)new TDEAction( i18n( "Status" ), 0, _catalogManager, + TQ_SLOT( cvsStatus( ) ), actionCollection( ), "cvs_status" ); + (void)new TDEAction( i18n( "Status for Marked" ), 0, _catalogManager, + TQ_SLOT( cvsStatusMarked( ) ), actionCollection( ), "cvs_status_marked" ); + (void)new TDEAction( i18n( "Show Diff" ), 0, _catalogManager, + TQ_SLOT( cvsDiff( ) ), actionCollection( ), "cvs_diff" ); // CVS actionMap["cvs_update"] = NEEDS_PO | NEEDS_PO_CVS; @@ -448,28 +448,28 @@ void CatalogManager::setupActions() // SVN submenu // Actions for PO files - (void)new TDEAction( i18n( "Update" ), "go-down", 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnUpdate( ) ), actionCollection( ), "svn_update" ); - (void)new TDEAction( i18n( "Update Marked" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnUpdateMarked( ) ), actionCollection( ), "svn_update_marked" ); - (void)new TDEAction( i18n( "Commit" ), "go-up", 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" ); - (void)new TDEAction( i18n( "Commit Marked" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" ); - (void)new TDEAction( i18n( "Status (Local)" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" ); - (void)new TDEAction( i18n( "Status (Local) for Marked" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" ); - (void)new TDEAction( i18n( "Status (Remote)" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" ); - (void)new TDEAction( i18n( "Status (Remote) for Marked" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" ); - (void)new TDEAction( i18n( "Show Diff" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" ); - (void)new TDEAction( i18n( "Show Information" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnInfo() ), actionCollection( ), "svn_info" ); - (void)new TDEAction( i18n( "Show Information for Marked" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnInfoMarked() ), actionCollection( ), "svn_info_marked" ); + (void)new TDEAction( i18n( "Update" ), "go-down", 0, _catalogManager, + TQ_SLOT( svnUpdate( ) ), actionCollection( ), "svn_update" ); + (void)new TDEAction( i18n( "Update Marked" ), 0, _catalogManager, + TQ_SLOT( svnUpdateMarked( ) ), actionCollection( ), "svn_update_marked" ); + (void)new TDEAction( i18n( "Commit" ), "go-up", 0, _catalogManager, + TQ_SLOT( svnCommit( ) ), actionCollection( ), "svn_commit" ); + (void)new TDEAction( i18n( "Commit Marked" ), 0, _catalogManager, + TQ_SLOT( svnCommitMarked( ) ), actionCollection( ), "svn_commit_marked" ); + (void)new TDEAction( i18n( "Status (Local)" ), 0, _catalogManager, + TQ_SLOT( svnStatusLocal() ), actionCollection( ), "svn_status_local" ); + (void)new TDEAction( i18n( "Status (Local) for Marked" ), 0, _catalogManager, + TQ_SLOT( svnStatusLocalMarked() ), actionCollection( ), "svn_status_local_marked" ); + (void)new TDEAction( i18n( "Status (Remote)" ), 0, _catalogManager, + TQ_SLOT( svnStatusRemote() ), actionCollection( ), "svn_status_remote" ); + (void)new TDEAction( i18n( "Status (Remote) for Marked" ), 0, _catalogManager, + TQ_SLOT( svnStatusRemoteMarked() ), actionCollection( ), "svn_status_remote_marked" ); + (void)new TDEAction( i18n( "Show Diff" ), 0, _catalogManager, + TQ_SLOT( svnDiff( ) ), actionCollection( ), "svn_diff" ); + (void)new TDEAction( i18n( "Show Information" ), 0, _catalogManager, + TQ_SLOT( svnInfo() ), actionCollection( ), "svn_info" ); + (void)new TDEAction( i18n( "Show Information for Marked" ), 0, _catalogManager, + TQ_SLOT( svnInfoMarked() ), actionCollection( ), "svn_info_marked" ); // SVN actionMap["svn_update"] = NEEDS_PO | NEEDS_PO_SVN; @@ -485,14 +485,14 @@ void CatalogManager::setupActions() actionMap["svn_info_marked"] = NEEDS_PO | NEEDS_PO_SVN | NEEDS_MARK; // CVS Actions for POT files - (void)new TDEAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( cvsUpdateTemplate( ) ), actionCollection( ), "cvs_update_template" ); - (void)new TDEAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( cvsUpdateMarkedTemplate( ) ), actionCollection( ), "cvs_update_marked_template" ); - (void)new TDEAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( cvsCommitTemplate( ) ), actionCollection( ), "cvs_commit_template" ); - (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( cvsCommitMarkedTemplate( ) ), actionCollection( ), "cvs_commit_marked_template" ); + (void)new TDEAction( i18n( "Update Templates" ), 0, _catalogManager, + TQ_SLOT( cvsUpdateTemplate( ) ), actionCollection( ), "cvs_update_template" ); + (void)new TDEAction( i18n( "Update Marked Templates" ), 0, _catalogManager, + TQ_SLOT( cvsUpdateMarkedTemplate( ) ), actionCollection( ), "cvs_update_marked_template" ); + (void)new TDEAction( i18n( "Commit Templates" ), 0, _catalogManager, + TQ_SLOT( cvsCommitTemplate( ) ), actionCollection( ), "cvs_commit_template" ); + (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, _catalogManager, + TQ_SLOT( cvsCommitMarkedTemplate( ) ), actionCollection( ), "cvs_commit_marked_template" ); actionMap["cvs_update_template"] = NEEDS_POT | NEEDS_POT_CVS; actionMap["cvs_update_marked_template"] = NEEDS_POT | NEEDS_POT_CVS | NEEDS_MARK; @@ -500,14 +500,14 @@ void CatalogManager::setupActions() actionMap["cvs_commit_marked_template"] = NEEDS_POT | NEEDS_POT_CVS | NEEDS_MARK; // SVN Actions for POT files - (void)new TDEAction( i18n( "Update Templates" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnUpdateTemplate( ) ), actionCollection( ), "svn_update_template" ); - (void)new TDEAction( i18n( "Update Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnUpdateMarkedTemplate( ) ), actionCollection( ), "svn_update_marked_template" ); - (void)new TDEAction( i18n( "Commit Templates" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnCommitTemplate( ) ), actionCollection( ), "svn_commit_template" ); - (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, TQT_TQOBJECT(_catalogManager), - TQT_SLOT( svnCommitMarkedTemplate( ) ), actionCollection( ), "svn_commit_marked_template" ); + (void)new TDEAction( i18n( "Update Templates" ), 0, _catalogManager, + TQ_SLOT( svnUpdateTemplate( ) ), actionCollection( ), "svn_update_template" ); + (void)new TDEAction( i18n( "Update Marked Templates" ), 0, _catalogManager, + TQ_SLOT( svnUpdateMarkedTemplate( ) ), actionCollection( ), "svn_update_marked_template" ); + (void)new TDEAction( i18n( "Commit Templates" ), 0, _catalogManager, + TQ_SLOT( svnCommitTemplate( ) ), actionCollection( ), "svn_commit_template" ); + (void)new TDEAction( i18n( "Commit Marked Templates" ), 0, _catalogManager, + TQ_SLOT( svnCommitMarkedTemplate( ) ), actionCollection( ), "svn_commit_marked_template" ); actionMap["svn_update_template"] = NEEDS_POT | NEEDS_POT_SVN; actionMap["svn_update_marked_template"] = NEEDS_POT | NEEDS_POT_SVN | NEEDS_MARK; @@ -515,7 +515,7 @@ void CatalogManager::setupActions() actionMap["svn_commit_marked_template"] = NEEDS_POT | NEEDS_POT_SVN | NEEDS_MARK; // settings menu - // FIXME: KStdAction::preferences(this, TQT_SLOT( optionsPreferences()), actionCollection()); + // FIXME: KStdAction::preferences(this, TQ_SLOT( optionsPreferences()), actionCollection()); createStandardStatusBarAction(); @@ -530,7 +530,7 @@ void CatalogManager::setupActions() actionCollection(), "file_commands"); _catalogManager->setFileCommandsMenu( actionMenu->popupMenu()); - action = new TDEAction(i18n("&Delete"),Key_Delete,TQT_TQOBJECT(_catalogManager),TQT_SLOT(slotDeleteFile()),actionCollection(), "delete"); + action = new TDEAction(i18n("&Delete"),Key_Delete,_catalogManager,TQ_SLOT(slotDeleteFile()),actionCollection(), "delete"); action->setEnabled(false); #if KDE_IS_VERSION( 3, 2, 90 ) @@ -632,7 +632,7 @@ CatalogManagerView *CatalogManager::view() void CatalogManager::openFile(TQString filename, TQString package) { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); if( startKBabel() ) { @@ -657,7 +657,7 @@ void CatalogManager::openFile(TQString filename, TQString package) kdDebug(KBABEL_CATMAN) << callfunc << endl; // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", callfunc, data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -667,7 +667,7 @@ void CatalogManager::openFile(TQString filename, TQString package) void CatalogManager::openFile(TQString filename, TQString package, int msgid) { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); if( startKBabel() ) { @@ -690,7 +690,7 @@ void CatalogManager::openFile(TQString filename, TQString package, int msgid) kdDebug(KBABEL_CATMAN) << callfunc << endl; // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", callfunc, data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -700,7 +700,7 @@ void CatalogManager::openFile(TQString filename, TQString package, int msgid) void CatalogManager::openFileInNewWindow(TQString filename, TQString package) { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); if( startKBabel() ) { @@ -721,7 +721,7 @@ void CatalogManager::openFileInNewWindow(TQString filename, TQString package) } // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", callfunc, data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -731,7 +731,7 @@ void CatalogManager::openFileInNewWindow(TQString filename, TQString package) void CatalogManager::openTemplate(TQString openFilename,TQString saveFilename,TQString package) { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); if( startKBabel() ) { TQByteArray data; @@ -751,7 +751,7 @@ void CatalogManager::openTemplate(TQString openFilename,TQString saveFilename,TQ } // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", callfunc, data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -761,7 +761,7 @@ void CatalogManager::openTemplate(TQString openFilename,TQString saveFilename,TQ void CatalogManager::openTemplateInNewWindow(TQString openFilename,TQString saveFilename,TQString package) { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); if( startKBabel() ) { TQByteArray data; @@ -781,7 +781,7 @@ void CatalogManager::openTemplateInNewWindow(TQString openFilename,TQString save } // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", callfunc, data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -791,7 +791,7 @@ void CatalogManager::openTemplateInNewWindow(TQString openFilename,TQString save void CatalogManager::spellcheck() { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); TQStringList fileList = _catalogManager->current(); @@ -801,7 +801,7 @@ void CatalogManager::spellcheck() arg << fileList; // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", "spellcheck(TQStringList)", data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -811,7 +811,7 @@ void CatalogManager::spellcheck() void CatalogManager::markedSpellcheck() { - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); TQStringList fileList = _catalogManager->marked(); @@ -821,7 +821,7 @@ void CatalogManager::markedSpellcheck() arg << fileList; // update the user timestamp for KBabel to get it a focus - kapp->updateRemoteUserTimestamp ("kbabel"); + tdeApp->updateRemoteUserTimestamp ("kbabel"); if( !client->send("kbabel","KBabelIFace", "spellcheck(TQStringList)", data) ) KMessageBox::error(this, i18n("Cannot send a message to KBabel.\n" @@ -834,7 +834,7 @@ bool CatalogManager::startKBabel() TQCString service; TQString result; - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); // find out, if there is a running kbabel QCStringList apps = client->registeredApplications(); @@ -853,7 +853,7 @@ bool CatalogManager::startKBabel() { TQString app = "kbabel"; TQString url = ""; - if( kapp->startServiceByDesktopName(app,url, &result, &service)) + if( tdeApp->startServiceByDesktopName(app,url, &result, &service)) { KMessageBox::error( this, i18n("Unable to use TDELauncher to start KBabel.\n" "You should check the installation of TDE.\n" @@ -925,7 +925,7 @@ void CatalogManager::decreaseNumberOfFound() void CatalogManager::slotHelp() { - kapp->invokeHelp("CATALOGMANAGER","kbabel"); + tdeApp->invokeHelp("CATALOGMANAGER","kbabel"); } void CatalogManager::find() @@ -959,7 +959,7 @@ void CatalogManager::find() if( startKBabel() ) { TQCString funcCall("findInFile(TQCString,TQCString,TQString,int,int,int,int,int,int,int,int,int,int)"); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << client->appId(); @@ -1044,7 +1044,7 @@ void CatalogManager::replace() if( startKBabel() ) { TQCString funcCall("replaceInFile(TQCString,TQCString,TQString,TQString,int,int,int,int,int,int,int,int,int,int,int)"); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); @@ -1188,11 +1188,11 @@ void CatalogManager::projectNew() KBabel::Project::Ptr p = KBabel::ProjectWizard::newProject(); if( p ) { - disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) - , TQT_TQOBJECT(this), TQT_SLOT (updateSettings())); + disconnect( _project, TQ_SIGNAL (signalCatManSettingsChanged()) + , this, TQ_SLOT (updateSettings())); _project = p; - connect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) - , TQT_TQOBJECT(this), TQT_SLOT (updateSettings())); + connect( _project, TQ_SIGNAL (signalCatManSettingsChanged()) + , this, TQ_SLOT (updateSettings())); _configFile = _project->filename(); restoreSettings(); @@ -1217,11 +1217,11 @@ void CatalogManager::projectOpen() KBabel::Project::Ptr p = KBabel::ProjectManager::open(file); if( p ) { - disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) - , TQT_TQOBJECT(this), TQT_SLOT (updateSettings())); + disconnect( _project, TQ_SIGNAL (signalCatManSettingsChanged()) + , this, TQ_SLOT (updateSettings())); _project = p; - connect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) - , TQT_TQOBJECT(this), TQT_SLOT (updateSettings())); + connect( _project, TQ_SIGNAL (signalCatManSettingsChanged()) + , this, TQ_SLOT (updateSettings())); _configFile = p->filename(); restoreSettings(); @@ -1238,11 +1238,11 @@ void CatalogManager::projectOpen() void CatalogManager::projectClose() { - disconnect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) - , TQT_TQOBJECT(this), TQT_SLOT (updateSettings())); + disconnect( _project, TQ_SIGNAL (signalCatManSettingsChanged()) + , this, TQ_SLOT (updateSettings())); _project = KBabel::ProjectManager::open(KBabel::ProjectManager::defaultProjectName()); - connect( _project, TQT_SIGNAL (signalCatManSettingsChanged()) - , TQT_TQOBJECT(this), TQT_SLOT (updateSettings())); + connect( _project, TQ_SIGNAL (signalCatManSettingsChanged()) + , this, TQ_SLOT (updateSettings())); _configFile = _project->filename(); restoreSettings(); updateSettings(); @@ -1262,8 +1262,8 @@ void CatalogManager::projectConfigure() { KBabel::ProjectDialog* _projectDialog = new ProjectDialog(_project); - connect (_projectDialog, TQT_SIGNAL (settingsChanged()) - , TQT_TQOBJECT(this), TQT_SLOT (updateSettings())); + connect (_projectDialog, TQ_SIGNAL (settingsChanged()) + , this, TQ_SLOT (updateSettings())); // settings are updated via signals _projectDialog->exec(); diff --git a/kbabel/catalogmanager/catalogmanager.h b/kbabel/catalogmanager/catalogmanager.h index 6eff80ae..bec8791a 100644 --- a/kbabel/catalogmanager/catalogmanager.h +++ b/kbabel/catalogmanager/catalogmanager.h @@ -44,7 +44,7 @@ #include <tdeversion.h> #include <tdemainwindow.h> #include <kdirwatch.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqptrlist.h> #include "projectsettings.h" diff --git a/kbabel/catalogmanager/catalogmanagerview.cpp b/kbabel/catalogmanager/catalogmanagerview.cpp index 8eed87f5..f8de3fc5 100644 --- a/kbabel/catalogmanager/catalogmanagerview.cpp +++ b/kbabel/catalogmanager/catalogmanagerview.cpp @@ -132,7 +132,7 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p _dictBox->hide(); _updateTimer = new TQTimer(this); - connect(_updateTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(checkUpdate())); + connect(_updateTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(checkUpdate())); addColumn(COLTEXT(COL_NAME)); addColumn(COLTEXT(COL_MARKER),25); @@ -154,21 +154,21 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p if(KContextMenuManager::showOnButtonPress()) { - connect(this,TQT_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &, int)) - ,this, TQT_SLOT(showContentsMenu(TQListViewItem*,const TQPoint &, int))); + connect(this,TQ_SIGNAL(rightButtonPressed(TQListViewItem*,const TQPoint &, int)) + ,this, TQ_SLOT(showContentsMenu(TQListViewItem*,const TQPoint &, int))); } else { - connect(this,TQT_SIGNAL(rightButtonClicked(TQListViewItem*,const TQPoint &, int)) - ,this, TQT_SLOT(showContentsMenu(TQListViewItem*,const TQPoint &, int))); + connect(this,TQ_SIGNAL(rightButtonClicked(TQListViewItem*,const TQPoint &, int)) + ,this, TQ_SLOT(showContentsMenu(TQListViewItem*,const TQPoint &, int))); } - connect(this, TQT_SIGNAL(returnPressed(TQListViewItem*)) - ,this, TQT_SLOT(activateItem(TQListViewItem*))); - connect(this, TQT_SIGNAL(doubleClicked(TQListViewItem*)) - ,this, TQT_SLOT(activateItem(TQListViewItem*))); - connect(this,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(checkSelected())); - connect( this, TQT_SIGNAL( clicked(TQListViewItem *, const TQPoint &, int)), - this, TQT_SLOT( columnClicked(TQListViewItem *, const TQPoint &, int))); + connect(this, TQ_SIGNAL(returnPressed(TQListViewItem*)) + ,this, TQ_SLOT(activateItem(TQListViewItem*))); + connect(this, TQ_SIGNAL(doubleClicked(TQListViewItem*)) + ,this, TQ_SLOT(activateItem(TQListViewItem*))); + connect(this,TQ_SIGNAL(selectionChanged()),this,TQ_SLOT(checkSelected())); + connect( this, TQ_SIGNAL( clicked(TQListViewItem *, const TQPoint &, int)), + this, TQ_SLOT( columnClicked(TQListViewItem *, const TQPoint &, int))); _dirCommandsMenu = 0; _fileCommandsMenu = 0; @@ -189,7 +189,7 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p _logWindow->setMainWidget(_logView); - connect(_logWindow,TQT_SIGNAL(user1Clicked()),_logView,TQT_SLOT(clear())); + connect(_logWindow,TQ_SIGNAL(user1Clicked()),_logView,TQ_SLOT(clear())); TQWhatsThis::add(this,i18n("<qt><p><b>Catalog Manager</b></p>\n" "<p>The Catalog Manager merges two folders into one tree and displays all\n" @@ -205,21 +205,21 @@ CatalogManagerView::CatalogManagerView(KBabel::Project::Ptr project, TQWidget* p // CVS cvshandler = new CVSHandler( ); - connect( cvshandler, TQT_SIGNAL( signalIsPORepository( bool ) ), - this, TQT_SLOT( slotValidPOCVSRepository( bool ) ) ); - connect( cvshandler, TQT_SIGNAL( signalIsPOTRepository( bool ) ), - this, TQT_SLOT( slotValidPOTCVSRepository( bool ) ) ); - connect( cvshandler, TQT_SIGNAL( signalFilesCommitted( const TQStringList& ) ), - this, TQT_SLOT( updateFiles( const TQStringList& ) ) ); + connect( cvshandler, TQ_SIGNAL( signalIsPORepository( bool ) ), + this, TQ_SLOT( slotValidPOCVSRepository( bool ) ) ); + connect( cvshandler, TQ_SIGNAL( signalIsPOTRepository( bool ) ), + this, TQ_SLOT( slotValidPOTCVSRepository( bool ) ) ); + connect( cvshandler, TQ_SIGNAL( signalFilesCommitted( const TQStringList& ) ), + this, TQ_SLOT( updateFiles( const TQStringList& ) ) ); // SVN svnhandler = new SVNHandler( ); - connect( svnhandler, TQT_SIGNAL( signalIsPORepository( bool ) ), - this, TQT_SLOT( slotValidPOSVNRepository( bool ) ) ); - connect( svnhandler, TQT_SIGNAL( signalIsPOTRepository( bool ) ), - this, TQT_SLOT( slotValidPOTSVNRepository( bool ) ) ); - connect( svnhandler, TQT_SIGNAL( signalFilesCommitted( const TQStringList& ) ), - this, TQT_SLOT( updateFiles( const TQStringList& ) ) ); + connect( svnhandler, TQ_SIGNAL( signalIsPORepository( bool ) ), + this, TQ_SLOT( slotValidPOSVNRepository( bool ) ) ); + connect( svnhandler, TQ_SIGNAL( signalIsPOTRepository( bool ) ), + this, TQ_SLOT( slotValidPOTSVNRepository( bool ) ) ); + connect( svnhandler, TQ_SIGNAL( signalFilesCommitted( const TQStringList& ) ), + this, TQ_SLOT( updateFiles( const TQStringList& ) ) ); TDEConfig *config = TDEGlobal::config(); restoreView(config); @@ -284,13 +284,13 @@ void CatalogManagerView::setRMBMenuDir( TQPopupMenu *m ) void CatalogManagerView::setDirCommandsMenu( TQPopupMenu *m ) { _dirCommandsMenu = m; - connect(_dirCommandsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotDirCommand(int))); + connect(_dirCommandsMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotDirCommand(int))); } void CatalogManagerView::setFileCommandsMenu( TQPopupMenu *m ) { _fileCommandsMenu = m; - connect(_fileCommandsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(slotFileCommand(int))); + connect(_fileCommandsMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(slotFileCommand(int))); } void CatalogManagerView::checkUpdate() @@ -353,12 +353,12 @@ void CatalogManagerView::clear() delete _dirWatch; _dirWatch= new KDirWatch(); - connect(_dirWatch,TQT_SIGNAL(deleted(const TQString&)),this - ,TQT_SLOT(directoryDeleted(const TQString&))); - connect(_dirWatch,TQT_SIGNAL(dirty(const TQString&)),this - ,TQT_SLOT(directoryChanged(const TQString&))); - connect(_dirWatch,TQT_SIGNAL(created(const TQString&)),this - ,TQT_SLOT(directoryChanged(const TQString&))); + connect(_dirWatch,TQ_SIGNAL(deleted(const TQString&)),this + ,TQ_SLOT(directoryDeleted(const TQString&))); + connect(_dirWatch,TQ_SIGNAL(dirty(const TQString&)),this + ,TQ_SLOT(directoryChanged(const TQString&))); + connect(_dirWatch,TQ_SIGNAL(created(const TQString&)),this + ,TQ_SLOT(directoryChanged(const TQString&))); _dirList.clear(); _fileList.clear(); @@ -1620,12 +1620,12 @@ void CatalogManagerView::slotDirCommand(int index) TDEProcess* proc = new KShellProcess(); _pendingProcesses.append(proc); - connect( proc,TQT_SIGNAL( processExited(TDEProcess *) ), this - ,TQT_SLOT( processEnded(TDEProcess*) ) ); - connect( proc,TQT_SIGNAL( receivedStdout(TDEProcess*,char*,int) ), this - ,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) ); - connect( proc,TQT_SIGNAL( receivedStderr(TDEProcess*,char*,int) ), this - ,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) ); + connect( proc,TQ_SIGNAL( processExited(TDEProcess *) ), this + ,TQ_SLOT( processEnded(TDEProcess*) ) ); + connect( proc,TQ_SIGNAL( receivedStdout(TDEProcess*,char*,int) ), this + ,TQ_SLOT( showOutput(TDEProcess*,char*,int) ) ); + connect( proc,TQ_SIGNAL( receivedStderr(TDEProcess*,char*,int) ), this + ,TQ_SLOT( showOutput(TDEProcess*,char*,int) ) ); *proc << "cd" << item->poFile() << ";" << cmd; proc->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); @@ -1653,12 +1653,12 @@ void CatalogManagerView::slotFileCommand(int index) TDEProcess* proc = new KShellProcess(); _pendingProcesses.append(proc); - connect( proc,TQT_SIGNAL( processExited(TDEProcess *) ), this - ,TQT_SLOT( processEnded(TDEProcess*) ) ); - connect( proc,TQT_SIGNAL( receivedStdout(TDEProcess*,char*,int) ), this - ,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) ); - connect( proc,TQT_SIGNAL( receivedStderr(TDEProcess*,char*,int) ), this - ,TQT_SLOT( showOutput(TDEProcess*,char*,int) ) ); + connect( proc,TQ_SIGNAL( processExited(TDEProcess *) ), this + ,TQ_SLOT( processEnded(TDEProcess*) ) ); + connect( proc,TQ_SIGNAL( receivedStdout(TDEProcess*,char*,int) ), this + ,TQ_SLOT( showOutput(TDEProcess*,char*,int) ) ); + connect( proc,TQ_SIGNAL( receivedStderr(TDEProcess*,char*,int) ), this + ,TQ_SLOT( showOutput(TDEProcess*,char*,int) ) ); *proc << "cd" << parent->poFile() << ";" << cmd; proc->start(TDEProcess::NotifyOnExit,TDEProcess::AllOutput); @@ -1741,7 +1741,7 @@ void CatalogManagerView::updateAfterSave(TQString fileWithPath, PoInfo &newInfo) void CatalogManagerView::buildTree() { // in case we were called after settings update - disconnect( this, TQT_SIGNAL( updateFinished() ), this, TQT_SLOT(buildTree() ) ); + disconnect( this, TQ_SIGNAL( updateFinished() ), this, TQ_SLOT(buildTree() ) ); emit signalBuildTree(false); // announce start of building @@ -2444,7 +2444,7 @@ void CatalogManagerView::setSettings(CatManSettings newSettings) counter++; } _dirCommandsMenu->insertSeparator(); - _dirCommandsMenu->insertItem(i18n("Log Window"),this,TQT_SLOT(showLog())); + _dirCommandsMenu->insertItem(i18n("Log Window"),this,TQ_SLOT(showLog())); _fileCommandsMenu->clear(); counter=0; @@ -2455,7 +2455,7 @@ void CatalogManagerView::setSettings(CatManSettings newSettings) counter++; } _fileCommandsMenu->insertSeparator(); - _fileCommandsMenu->insertItem(i18n("Log Window"),this,TQT_SLOT(showLog())); + _fileCommandsMenu->insertItem(i18n("Log Window"),this,TQ_SLOT(showLog())); const bool pathChanged = (oldSettings.poBaseDir!=_settings.poBaseDir) || (oldSettings.potBaseDir!=_settings.potBaseDir); @@ -2463,10 +2463,10 @@ void CatalogManagerView::setSettings(CatManSettings newSettings) if(pathChanged) { if( !isActive() ) { - TQTimer::singleShot(100,this,TQT_SLOT(buildTree())); + TQTimer::singleShot(100,this,TQ_SLOT(buildTree())); } else { stop(); - connect( this, TQT_SIGNAL( updateFinished() ), this, TQT_SLOT(buildTree() ) ); + connect( this, TQ_SIGNAL( updateFinished() ), this, TQ_SLOT(buildTree() ) ); } } @@ -2497,7 +2497,7 @@ void CatalogManagerView::hideEvent(TQHideEvent*) void CatalogManagerView::showEvent(TQShowEvent*) { - TQTimer::singleShot(1,this,TQT_SLOT(checkUpdate())); + TQTimer::singleShot(1,this,TQ_SLOT(checkUpdate())); pause(false); @@ -3025,8 +3025,8 @@ void CatalogManagerView::validate_internal( const TQStringList& files, const KDa if( !_validateDialog ) { _validateDialog = new ValidateProgressDialog(_settings.ignoreURL, this); - connect( _validateDialog, TQT_SIGNAL( errorDoubleClicked(const TQString,const int)), - this, TQT_SLOT(showError( const TQString, const int ))); + connect( _validateDialog, TQ_SIGNAL( errorDoubleClicked(const TQString,const int)), + this, TQ_SLOT(showError( const TQString, const int ))); } _markAsFuzzy = _validateOptions->markAsFuzzy->isChecked(); diff --git a/kbabel/catalogmanager/catalogmanagerview.h b/kbabel/catalogmanager/catalogmanagerview.h index 4d31a66a..385b9d32 100644 --- a/kbabel/catalogmanager/catalogmanagerview.h +++ b/kbabel/catalogmanager/catalogmanagerview.h @@ -44,7 +44,7 @@ #include <kdialogbase.h> #include <kdirwatch.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqptrlist.h> #include "kbproject.h" diff --git a/kbabel/catalogmanager/catmanlistitem.cpp b/kbabel/catalogmanager/catmanlistitem.cpp index c2d03d53..ecb783b7 100644 --- a/kbabel/catalogmanager/catmanlistitem.cpp +++ b/kbabel/catalogmanager/catmanlistitem.cpp @@ -870,8 +870,8 @@ void CatManListItem::checkErrors(KDataTool* tool, TQObject* progressSignalHandle _errors.clear(); Catalog* cat = new Catalog(); - TQObject::connect( cat, TQT_SIGNAL( signalProgress(int) ), progressSignalHandler, TQT_SIGNAL( setValidationProgressBar(int))); - TQObject::connect( cat, TQT_SIGNAL( signalResetProgressBar(TQString, int) ), progressSignalHandler, TQT_SLOT( setupFileProgressBar(TQString, int))); + TQObject::connect( cat, TQ_SIGNAL( signalProgress(int) ), progressSignalHandler, TQ_SIGNAL( setValidationProgressBar(int))); + TQObject::connect( cat, TQ_SIGNAL( signalResetProgressBar(TQString, int) ), progressSignalHandler, TQ_SLOT( setupFileProgressBar(TQString, int))); if( cat->openURL(KURL( poFile() )) == OK ) { diff --git a/kbabel/catalogmanager/libcvs/cvsdialog.cpp b/kbabel/catalogmanager/libcvs/cvsdialog.cpp index 9568eff3..a2501b19 100644 --- a/kbabel/catalogmanager/libcvs/cvsdialog.cpp +++ b/kbabel/catalogmanager/libcvs/cvsdialog.cpp @@ -50,7 +50,7 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <tdemessagebox.h> #include <kstringhandler.h> @@ -123,8 +123,8 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, TDESharedConfig* conf encodingList += TDEGlobal::charsets()->descriptiveEncodingNames(); m_encodingComboBox->insertStringList( encodingList ); - connect( oldMessages, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotComboActivated( int ) ) ); + connect( oldMessages, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotComboActivated( int ) ) ); } TQHBoxLayout * buttons = new TQHBoxLayout( 0, 0, 6, "BUTTON LAYOUT" ); @@ -175,8 +175,8 @@ CVSDialog::CVSDialog( CVS::Command cmd, TQWidget * parent, TDESharedConfig* conf readSettings( ); - connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotExecuteCommand( ) ) ); - connect( cancelBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( reject( ) ) ); + connect( mainBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( slotExecuteCommand( ) ) ); + connect( cancelBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( reject( ) ) ); } void CVSDialog::slotComboActivated( int index ) @@ -301,12 +301,12 @@ void CVSDialog::slotExecuteCommand( ) // Set the TDEProcess' command line. *p << _commandLine; - connect( p, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - this, TQT_SLOT ( slotProcessStdout( TDEProcess*, char*, int ) ) ); - connect( p, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - this, TQT_SLOT ( slotProcessStderr( TDEProcess*, char*, int ) ) ); - connect( p, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( p, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQ_SLOT ( slotProcessStdout( TDEProcess*, char*, int ) ) ); + connect( p, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQ_SLOT ( slotProcessStderr( TDEProcess*, char*, int ) ) ); + connect( p, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) ); output->append( i18n( "[ Starting command ]" ) ); @@ -358,7 +358,7 @@ void CVSDialog::slotProcessExited( TDEProcess * p ) mainBtn->setText( i18n( "&Show Diff" ) ); else mainBtn->setText( i18n( "&Close" ) ); - connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( accept( ) ) ); + connect( mainBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( accept( ) ) ); // Reenable the button and the log edit now that the process is finished. mainBtn->setEnabled( true ); diff --git a/kbabel/catalogmanager/libsvn/svndialog.cpp b/kbabel/catalogmanager/libsvn/svndialog.cpp index feecd162..46f43fa7 100644 --- a/kbabel/catalogmanager/libsvn/svndialog.cpp +++ b/kbabel/catalogmanager/libsvn/svndialog.cpp @@ -49,7 +49,7 @@ #include <kdebug.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <tdemessagebox.h> #include <kstringhandler.h> @@ -114,8 +114,8 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, TDESharedConfig* conf layout->addWidget( label ); layout->addWidget( logedit ); - connect( oldMessages, TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( slotComboActivated( int ) ) ); + connect( oldMessages, TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( slotComboActivated( int ) ) ); } TQHBoxLayout * buttons = new TQHBoxLayout( 0, 0, 6, "BUTTON LAYOUT" ); @@ -170,8 +170,8 @@ SVNDialog::SVNDialog( SVN::Command cmd, TQWidget * parent, TDESharedConfig* conf readSettings( ); - connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( slotExecuteCommand( ) ) ); - connect( cancelBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( reject( ) ) ); + connect( mainBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( slotExecuteCommand( ) ) ); + connect( cancelBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( reject( ) ) ); } void SVNDialog::slotComboActivated( int index ) @@ -280,12 +280,12 @@ void SVNDialog::slotExecuteCommand( ) // Set the TDEProcess' command line. *p << _commandLine; - connect( p, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - this, TQT_SLOT ( slotProcessStdout( TDEProcess*, char*, int ) ) ); - connect( p, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - this, TQT_SLOT ( slotProcessStderr( TDEProcess*, char*, int ) ) ); - connect( p, TQT_SIGNAL( processExited( TDEProcess* ) ), - this, TQT_SLOT( slotProcessExited( TDEProcess* ) ) ); + connect( p, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + this, TQ_SLOT ( slotProcessStdout( TDEProcess*, char*, int ) ) ); + connect( p, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + this, TQ_SLOT ( slotProcessStderr( TDEProcess*, char*, int ) ) ); + connect( p, TQ_SIGNAL( processExited( TDEProcess* ) ), + this, TQ_SLOT( slotProcessExited( TDEProcess* ) ) ); output->append( i18n( "[ Starting command ]" ) ); @@ -337,7 +337,7 @@ void SVNDialog::slotProcessExited( TDEProcess * p ) mainBtn->setText( i18n( "&Show Diff" ) ); else mainBtn->setText( i18n( "&Close" ) ); - connect( mainBtn, TQT_SIGNAL( clicked( ) ), this, TQT_SLOT( accept( ) ) ); + connect( mainBtn, TQ_SIGNAL( clicked( ) ), this, TQ_SLOT( accept( ) ) ); // Reenable the button and the log edit now that the process is finished. mainBtn->setEnabled( true ); diff --git a/kbabel/catalogmanager/libsvn/svnhandler.cpp b/kbabel/catalogmanager/libsvn/svnhandler.cpp index 31bdd5ad..e373457f 100644 --- a/kbabel/catalogmanager/libsvn/svnhandler.cpp +++ b/kbabel/catalogmanager/libsvn/svnhandler.cpp @@ -50,7 +50,7 @@ #include <tdemessagebox.h> #include <tdetempfile.h> #include <kdebug.h> -#include <kprocess.h> +#include <tdeprocess.h> // project specific include files #include "svnhandler.h" @@ -516,10 +516,10 @@ void SVNOutputCollector::setProcess( TDEProcess* p ) m_process = p; if( p ) { - connect( p, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this, TQT_SLOT(slotGatherStdout(TDEProcess*, char*, int)) ); - connect( p, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), - this, TQT_SLOT(slotGatherStderr(TDEProcess*, char*, int)) ); + connect( p, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this, TQ_SLOT(slotGatherStdout(TDEProcess*, char*, int)) ); + connect( p, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), + this, TQ_SLOT(slotGatherStderr(TDEProcess*, char*, int)) ); } m_gatheredOutput.truncate( 0 ); diff --git a/kbabel/catalogmanager/markpatterndialog.cpp b/kbabel/catalogmanager/markpatterndialog.cpp index d4ff458d..5ffffc08 100644 --- a/kbabel/catalogmanager/markpatterndialog.cpp +++ b/kbabel/catalogmanager/markpatterndialog.cpp @@ -54,14 +54,14 @@ MarkPatternDialog::MarkPatternDialog(TQWidget * parent, const char * name) mainWidget = new MarkPatternWidget(this); - connect (mainWidget->combo, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(slotComboTextChanged(const TQString&))); + connect (mainWidget->combo, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(slotComboTextChanged(const TQString&))); comboCompletion = mainWidget->combo->completionObject( ); regexpEditDialog = 0; if (!TDETrader::self( )->query("KRegExpEditor/KRegExpEditor").isEmpty( )) { - connect(mainWidget->regexpButton, TQT_SIGNAL(clicked( )), this, TQT_SLOT(slotRegexpButtonClicked( ))); + connect(mainWidget->regexpButton, TQ_SIGNAL(clicked( )), this, TQ_SLOT(slotRegexpButtonClicked( ))); } else { disconnect(mainWidget->useRegExp, 0, mainWidget->regexpButton, 0); delete mainWidget->regexpButton; @@ -127,7 +127,7 @@ void MarkPatternDialog::slotRegexpButtonClicked( ) { if (!regexpEditDialog) regexpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( - "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this)); + "KRegExpEditor/KRegExpEditor", TQString(), this); KRegExpEditorInterface * iface = dynamic_cast<KRegExpEditorInterface *>(regexpEditDialog); diff --git a/kbabel/catalogmanager/multiroughtransdlg.cpp b/kbabel/catalogmanager/multiroughtransdlg.cpp index 841f8bbc..049b47a0 100644 --- a/kbabel/catalogmanager/multiroughtransdlg.cpp +++ b/kbabel/catalogmanager/multiroughtransdlg.cpp @@ -52,7 +52,7 @@ MultiRoughTransDlg::MultiRoughTransDlg(KBabelDictBox *dict, TQPtrList<CatManList : RoughTransDlg(dict, new Catalog(), parent, name ) ,_fileList(files) { - TQWidget* bars = TQT_TQWIDGET(progressbar->parent()); + TQWidget* bars = static_cast<TQWidget*>(progressbar->parent()); TQLabel* label = new TQLabel( i18n("Files:"), bars ); filesProgressbar = new KProgress(bars,"files progressbar"); filesProgressbar->setTextEnabled(true); diff --git a/kbabel/catalogmanager/validateprogress.cpp b/kbabel/catalogmanager/validateprogress.cpp index 02c97738..9cd7b904 100644 --- a/kbabel/catalogmanager/validateprogress.cpp +++ b/kbabel/catalogmanager/validateprogress.cpp @@ -72,12 +72,12 @@ ValidateProgressDialog::ValidateProgressDialog(const TQString& ignoreURL, TQWidg _errorMenu->insertItem(i18n("&Open"),ID_ERROR_OPEN); _errorMenu->insertItem(i18n("&Ignore"),ID_ERROR_IGNORE); - connect( this, TQT_SIGNAL(closeClicked()), this, TQT_SLOT(stop())); - connect( _mainWidget->_errorList, TQT_SIGNAL( doubleClicked(TQListBoxItem *)), - this, TQT_SLOT( errorItemDoubleClicked(TQListBoxItem *))); + connect( this, TQ_SIGNAL(closeClicked()), this, TQ_SLOT(stop())); + connect( _mainWidget->_errorList, TQ_SIGNAL( doubleClicked(TQListBoxItem *)), + this, TQ_SLOT( errorItemDoubleClicked(TQListBoxItem *))); - connect( _mainWidget->_errorList, TQT_SIGNAL( contextMenuRequested(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT( showContextMenu(TQListBoxItem *, const TQPoint &))); + connect( _mainWidget->_errorList, TQ_SIGNAL( contextMenuRequested(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT( showContextMenu(TQListBoxItem *, const TQPoint &))); } ValidateProgressDialog::~ValidateProgressDialog() @@ -111,7 +111,7 @@ void ValidateProgressDialog::validate( const KDataToolInfo &tool, const TQPtrLis _stopped = false; - TQTimer::singleShot( 0, this, TQT_SLOT(validate_internal()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(validate_internal()) ); exec(); @@ -133,7 +133,7 @@ void ValidateProgressDialog::validate_internal() _mainWidget->_currentFileProgress->setTotalSteps(100); _mainWidget->_currentFileProgress->setValue(0); - it->checkErrors(_tool, TQT_TQOBJECT(_mainWidget), _ignoreFuzzy, _setAsFuzzy); + it->checkErrors(_tool, _mainWidget, _ignoreFuzzy, _setAsFuzzy); bool noHeader = true; diff --git a/kbabel/catalogmanager/validateprogresswidget.ui b/kbabel/catalogmanager/validateprogresswidget.ui index fc2741e4..96179dc6 100644 --- a/kbabel/catalogmanager/validateprogresswidget.ui +++ b/kbabel/catalogmanager/validateprogresswidget.ui @@ -113,12 +113,12 @@ <includes> <include location="local" impldecl="in implementation">validateprogresswidget.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>setValidationProgressBar(int)</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>setupFileProgressBar( TQString text, int maxvalue )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kprogress.h</include> diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp index fcf50750..76ab194a 100644 --- a/kbabel/common/catalog.cpp +++ b/kbabel/common/catalog.cpp @@ -930,15 +930,15 @@ ConversionStatus Catalog::openURL(const KURL& url, const TQString& package) filter = static_cast<CatalogImportPlugin*>(factory->create(0, 0)); // provide progress bar indication - connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ), - this, TQT_SIGNAL( signalResetProgressBar(TQString,int) )); - connect( filter, TQT_SIGNAL( signalProgress(int) ), - this, TQT_SIGNAL( signalProgress(int) )); - connect( filter, TQT_SIGNAL( signalClearProgressBar() ), - this, TQT_SIGNAL( signalClearProgressBar() )); - - connect( this, TQT_SIGNAL( signalStopActivity() ), - filter, TQT_SLOT( stop() )); + connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ), + this, TQ_SIGNAL( signalResetProgressBar(TQString,int) )); + connect( filter, TQ_SIGNAL( signalProgress(int) ), + this, TQ_SIGNAL( signalProgress(int) )); + connect( filter, TQ_SIGNAL( signalClearProgressBar() ), + this, TQ_SIGNAL( signalClearProgressBar() )); + + connect( this, TQ_SIGNAL( signalStopActivity() ), + filter, TQ_SLOT( stop() )); // load in the file (target is always local) d->_active = true; @@ -1027,15 +1027,15 @@ ConversionStatus Catalog::openURL(const KURL& openUrl, const KURL& saveURL, cons filter = static_cast<CatalogImportPlugin*>(factory->create(0, 0)); // provide progress bar indication - connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ), - this, TQT_SIGNAL( signalResetProgressBar(TQString,int) )); - connect( filter, TQT_SIGNAL( signalProgress(int) ), - this, TQT_SIGNAL( signalProgress(int) )); - connect( filter, TQT_SIGNAL( signalClearProgressBar() ), - this, TQT_SIGNAL( signalClearProgressBar() )); + connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ), + this, TQ_SIGNAL( signalResetProgressBar(TQString,int) )); + connect( filter, TQ_SIGNAL( signalProgress(int) ), + this, TQ_SIGNAL( signalProgress(int) )); + connect( filter, TQ_SIGNAL( signalClearProgressBar() ), + this, TQ_SIGNAL( signalClearProgressBar() )); - connect( this, TQT_SIGNAL( signalStopActivity() ), - filter, TQT_SLOT( stop() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), + filter, TQ_SLOT( stop() )); // load in the file (target is always local) d->_active = true; @@ -1229,7 +1229,7 @@ bool Catalog::checkUsingTool(KDataTool* tool, bool clearErrors) kdDebug(KBABEL) << "checkUsingTool active" << endl; d->_active=true; d->_stop=false; - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); int index = 0; bool hasErrors=false; @@ -1256,7 +1256,7 @@ bool Catalog::checkUsingTool(KDataTool* tool, bool clearErrors) kdDebug(KBABEL) << "checkUsingTool not active" << endl; d->_active=false; d->_stop=false; - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); emit signalClearProgressBar(); @@ -1268,7 +1268,7 @@ void Catalog::modifyUsingTool(KDataTool* tool, const TQString& command) kdDebug(KBABEL) << "modifyUsingTool active" << endl; d->_active=true; d->_stop=false; - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); int index = 0; bool modified = false; @@ -1334,7 +1334,7 @@ void Catalog::modifyUsingTool(KDataTool* tool, const TQString& command) kdDebug(KBABEL) << "modifyUsingTool not active" << endl; d->_active=false; d->_stop=false; - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); emit signalClearProgressBar(); } @@ -1998,7 +1998,7 @@ ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite) } else { - TQString tempFile=kapp->tempSaveName(targetURL.path(0)); + TQString tempFile=tdeApp->tempSaveName(targetURL.path(0)); status = writeFile(tempFile,overwrite); @@ -2033,7 +2033,7 @@ ConversionStatus Catalog::saveFileAs(const KURL &url, bool overwrite) TQString Catalog::saveTempFile() { - TQString filename = kapp->tempSaveName("/temp/kbabel_temp.po"); + TQString filename = tdeApp->tempSaveName("/temp/kbabel_temp.po"); if( writeFile(filename) != OK ) { filename = TQString(); @@ -2093,15 +2093,15 @@ ConversionStatus Catalog::writeFile(TQString localFile , bool overwrite) filter = static_cast<CatalogExportPlugin*>(factory->create(0, 0)); // provide progress bar indication - connect( filter, TQT_SIGNAL( signalResetProgressBar(TQString,int) ), - this, TQT_SIGNAL( signalResetProgressBar(TQString,int) )); - connect( filter, TQT_SIGNAL( signalProgress(int) ), - this, TQT_SIGNAL( signalProgress(int) )); - connect( filter, TQT_SIGNAL( signalClearProgressBar() ), - this, TQT_SIGNAL( signalClearProgressBar() )); + connect( filter, TQ_SIGNAL( signalResetProgressBar(TQString,int) ), + this, TQ_SIGNAL( signalResetProgressBar(TQString,int) )); + connect( filter, TQ_SIGNAL( signalProgress(int) ), + this, TQ_SIGNAL( signalProgress(int) )); + connect( filter, TQ_SIGNAL( signalClearProgressBar() ), + this, TQ_SIGNAL( signalClearProgressBar() )); - connect( this, TQT_SIGNAL( signalStopActivity() ), - filter, TQT_SLOT( stop() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), + filter, TQ_SLOT( stop() )); // load in the file (target is always local) kdDebug(KBABEL) << "writeFile active" << endl; @@ -2504,7 +2504,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le kdDebug(KBABEL) << "findNext active" << endl; d->_active=true; d->_stop=false; - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); MiscSettings miscOptions = miscSettings(); @@ -2549,12 +2549,12 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le int contextInfoPos = -1; TQString targetStr; - kapp->processEvents(10); + tdeApp->processEvents(10); if( d->_stop || endReached) { kdDebug(KBABEL) << "FindNext: endReached or stopped" << endl; - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "findNext not active" << endl; d->_active=false; d->_stop=false; @@ -2763,7 +2763,7 @@ bool Catalog::findNext(const FindOptions* findOpts, DocPosition& docPos, int& le } } - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "findNext not active" << endl; d->_active=false; d->_stop=false; @@ -2779,7 +2779,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le kdDebug(KBABEL) << "findPrev active" << endl; d->_active=true; d->_stop=false; - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); MiscSettings miscOptions = miscSettings(); @@ -2798,12 +2798,12 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le int contextInfoPos = -1; TQString targetStr; - kapp->processEvents(10); + tdeApp->processEvents(10); if( d->_stop || beginReached) { kdDebug(KBABEL) << "FindNext: endReached or stopped" << endl; - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "findPrev active" << endl; d->_active=false; d->_stop=false; @@ -3034,7 +3034,7 @@ bool Catalog::findPrev(const FindOptions* findOpts, DocPosition& docPos, int& le } } - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "findPrev active" << endl; d->_active=false; d->_stop=false; @@ -3080,7 +3080,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) return DiffOk; } - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "diffv active" << endl; d->_active=true; d->_stop=false; @@ -3155,11 +3155,11 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) bestId = (*it); } - kapp->processEvents(10); + tdeApp->processEvents(10); if( d->_stop ) { - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug (KBABEL) << "diffv not active" << endl; @@ -3199,7 +3199,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) if( !d->diffCache.insert(entry,s) ) delete s; - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "diffv not active" << endl; d->_active=false; d->_stop=false; @@ -3209,7 +3209,7 @@ Catalog::DiffResult Catalog::diff(uint entry, TQString *result) void Catalog::setDiffList( const TQValueList<DiffEntry>& list) { - connect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + connect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "setDiffList active" << endl; d->_active=true; d->_stop=false; @@ -3232,7 +3232,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list) { oldPercent = percent; emit signalProgress(percent); - kapp->processEvents(10); + tdeApp->processEvents(10); } TQString id = (*it).msgid; @@ -3259,7 +3259,7 @@ void Catalog::setDiffList( const TQValueList<DiffEntry>& list) emit signalClearProgressBar(); - disconnect( this, TQT_SIGNAL( signalStopActivity() ), this, TQT_SLOT( stopInternal() )); + disconnect( this, TQ_SIGNAL( signalStopActivity() ), this, TQ_SLOT( stopInternal() )); kdDebug(KBABEL) << "setDiffList not active" << endl; d->_active=false; d->_stop=false; diff --git a/kbabel/common/catalog.h b/kbabel/common/catalog.h index f5c37309..402af6dc 100644 --- a/kbabel/common/catalog.h +++ b/kbabel/common/catalog.h @@ -44,8 +44,8 @@ #include <tqptrlist.h> #include <tqvaluevector.h> -#include <kdemacros.h> -#include <kstandarddirs.h> +#include <tdemacros.h> +#include <tdestandarddirs.h> class KDataTool; class TQString; @@ -107,7 +107,7 @@ struct DiffEntry * @short Class, that represents a translation catalog(po-file) * @author Matthias Kiefer <matthias.kiefer@gmx.de> */ -class KDE_EXPORT Catalog : public TQObject +class TDE_EXPORT Catalog : public TQObject { TQ_OBJECT @@ -188,7 +188,7 @@ public: * @return context information found in the message comment * @deprecated */ - TQString context(uint index) const KDE_DEPRECATED; + TQString context(uint index) const TDE_DEPRECATED; /** * Get the header for the current file. diff --git a/kbabel/common/catalogfileplugin.h b/kbabel/common/catalogfileplugin.h index c6dd1575..a1f12482 100644 --- a/kbabel/common/catalogfileplugin.h +++ b/kbabel/common/catalogfileplugin.h @@ -34,7 +34,7 @@ #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQString; @@ -79,7 +79,7 @@ enum ConversionStatus { * @short Base class for Catalog import plugins * @author Stanislav Visnovsky <visnovsky@kde.org> */ -class KDE_EXPORT CatalogImportPlugin: public TQObject +class TDE_EXPORT CatalogImportPlugin: public TQObject { TQ_OBJECT @@ -175,7 +175,7 @@ private: * @short Base class for Catalog export plugins * @author Stanislav Visnovsky <visnovsky@kde.org> */ -class KDE_EXPORT CatalogExportPlugin: public TQObject +class TDE_EXPORT CatalogExportPlugin: public TQObject { TQ_OBJECT diff --git a/kbabel/common/catalogitem.h b/kbabel/common/catalogitem.h index bb02b1d8..6f2beba6 100644 --- a/kbabel/common/catalogitem.h +++ b/kbabel/common/catalogitem.h @@ -60,7 +60,7 @@ class CatalogItemPrivate; * @short Class, representing an entry in a catalog * @author Matthias Kiefer <matthias.kiefer@gmx.de> */ -class KDE_EXPORT CatalogItem +class TDE_EXPORT CatalogItem { public: diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp index d7236b80..287dc4d2 100644 --- a/kbabel/common/catalogsettings.cpp +++ b/kbabel/common/catalogsettings.cpp @@ -38,7 +38,7 @@ #include <tdeemailsettings.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <stdlib.h> diff --git a/kbabel/common/catalogsettings.h b/kbabel/common/catalogsettings.h index 552f88c5..55bb1432 100644 --- a/kbabel/common/catalogsettings.h +++ b/kbabel/common/catalogsettings.h @@ -37,7 +37,7 @@ #include <tqstring.h> #include <tqregexp.h> #include <tqdatetime.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQTextCodec; class TQStringList; @@ -45,7 +45,7 @@ class TQStringList; namespace KBabel { -struct KDE_EXPORT SaveSettings +struct TDE_EXPORT SaveSettings { bool autoUpdate; bool updateLastTranslator; @@ -74,7 +74,7 @@ struct KDE_EXPORT SaveSettings int autoSaveDelay; }; -struct KDE_EXPORT IdentitySettings +struct TDE_EXPORT IdentitySettings { TQString authorName; TQString authorLocalizedName; @@ -98,7 +98,7 @@ struct KDE_EXPORT IdentitySettings }; -struct KDE_EXPORT MiscSettings +struct TDE_EXPORT MiscSettings { /** * The char, that marks keyboard accelerators. @@ -144,13 +144,13 @@ struct TagSettings TQStringList argExpressions; }; -KDE_EXPORT TQString charsetString(const int encoding); -KDE_EXPORT TQString charsetString(const TQTextCodec *codec); -KDE_EXPORT TQString GNUPluralForms(const TQString& lang); +TDE_EXPORT TQString charsetString(const int encoding); +TDE_EXPORT TQString charsetString(const TQTextCodec *codec); +TDE_EXPORT TQString GNUPluralForms(const TQString& lang); namespace Defaults { - class KDE_EXPORT Identity + class TDE_EXPORT Identity { public: static TQString authorName(); @@ -161,7 +161,7 @@ namespace Defaults static TQString timezone(); }; - class KDE_EXPORT Tag + class TDE_EXPORT Tag { public: static TQStringList tagExpressions(); diff --git a/kbabel/common/editcmd.h b/kbabel/common/editcmd.h index 5dc1c536..feaf1fec 100644 --- a/kbabel/common/editcmd.h +++ b/kbabel/common/editcmd.h @@ -35,12 +35,12 @@ #include "itempart.h" #include <tqstring.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KBabel { -class KDE_EXPORT EditCommand +class TDE_EXPORT EditCommand { public: enum Commands { Invalid, Begin, End, Insert, Delete }; @@ -64,7 +64,7 @@ private: }; -class KDE_EXPORT BeginCommand : public EditCommand +class TDE_EXPORT BeginCommand : public EditCommand { public: BeginCommand( const int index, const Part part ) : EditCommand(index,part) {} @@ -73,7 +73,7 @@ public: }; -class KDE_EXPORT EndCommand : public EditCommand +class TDE_EXPORT EndCommand : public EditCommand { public: EndCommand( const int index, const Part part ) : EditCommand(index,part) {} @@ -83,7 +83,7 @@ public: -class KDE_EXPORT DelTextCmd : public EditCommand +class TDE_EXPORT DelTextCmd : public EditCommand { public: int offset; @@ -97,7 +97,7 @@ public: bool merge( EditCommand* other); }; -class KDE_EXPORT InsTextCmd : public DelTextCmd +class TDE_EXPORT InsTextCmd : public DelTextCmd { public: diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp index a85fb990..471660f0 100644 --- a/kbabel/common/kbmailer.cpp +++ b/kbabel/common/kbmailer.cpp @@ -68,11 +68,11 @@ KBabelMailer::~KBabelMailer() void KBabelMailer::sendOneFile(const TQString& fileName) { if (!singleFileCompression) { - kapp->invokeMailer("", "", "", "", "", "", fileName); + tdeApp->invokeMailer("", "", "", "", "", "", fileName); } else { const TQString archive ( createArchive( TQStringList( fileName ), TQFileInfo( fileName ).baseName() ) ); if ( !archive.isEmpty() ) { - kapp->invokeMailer("", "", "", "", "", "", archive); + tdeApp->invokeMailer("", "", "", "", "", "", archive); } } } @@ -100,7 +100,7 @@ void KBabelMailer::sendOneFile( const KURL& url) TQString tempName( m_tempDir.name() ); tempName += fileName; if ( TDEIO::NetAccess::download( url, tempName, m_parent ) ) - kapp->invokeMailer("", "", "", "", "", "", fileName); + tdeApp->invokeMailer("", "", "", "", "", "", fileName); else { KMessageBox::error( m_parent, i18n("Error while trying to download file %1.").arg( url.prettyURL() ) ); @@ -110,7 +110,7 @@ void KBabelMailer::sendOneFile( const KURL& url) { const TQString archive ( createArchive( TQStringList( url.url() ), url.filename() ) ); if ( !archive.isEmpty() ) { - kapp->invokeMailer("", "", "", "", "", "", archive); + tdeApp->invokeMailer("", "", "", "", "", "", archive); } } } @@ -119,7 +119,7 @@ void KBabelMailer::sendFiles(TQStringList fileList, const TQString& initialName) { const TQString archive ( createArchive( fileList, initialName ) ); if ( !archive.isEmpty() ) { - kapp->invokeMailer("", "", "", "", "", "", archive); + tdeApp->invokeMailer("", "", "", "", "", "", archive); } } diff --git a/kbabel/common/kbmailer.h b/kbabel/common/kbmailer.h index fe1cfe89..265b0b6c 100644 --- a/kbabel/common/kbmailer.h +++ b/kbabel/common/kbmailer.h @@ -37,7 +37,7 @@ #define KBMAILER_H #include <kbproject.h> -#include <kdemacros.h> +#include <tdemacros.h> #include <ktempdir.h> class TQWidget; @@ -56,7 +56,7 @@ namespace KBabel * * @internal */ -class KDE_EXPORT KBabelMailer +class TDE_EXPORT KBabelMailer { public: /** diff --git a/kbabel/common/kbproject.h b/kbabel/common/kbproject.h index f4983ab5..aa29df1a 100644 --- a/kbabel/common/kbproject.h +++ b/kbabel/common/kbproject.h @@ -43,7 +43,7 @@ namespace KBabel { class ProjectSettingsBase; - class KDE_EXPORT Project : public TQObject, public TDEShared + class TDE_EXPORT Project : public TQObject, public TDEShared { TQ_OBJECT diff --git a/kbabel/common/kbprojectmanager.cpp b/kbabel/common/kbprojectmanager.cpp index 7b369ad7..e26edff6 100644 --- a/kbabel/common/kbprojectmanager.cpp +++ b/kbabel/common/kbprojectmanager.cpp @@ -32,7 +32,7 @@ **************************************************************************** */ #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "kbprojectmanager.h" diff --git a/kbabel/common/kbprojectmanager.h b/kbabel/common/kbprojectmanager.h index 40ec5884..388097aa 100644 --- a/kbabel/common/kbprojectmanager.h +++ b/kbabel/common/kbprojectmanager.h @@ -35,14 +35,14 @@ #include <tqstring.h> #include <tqptrlist.h> -#include <kdemacros.h> +#include <tdemacros.h> #include "kbproject.h" namespace KBabel { - class KDE_EXPORT ProjectManager + class TDE_EXPORT ProjectManager { public: static Project::Ptr open( const TQString& file ); diff --git a/kbabel/common/msgfmt.cpp b/kbabel/common/msgfmt.cpp index 5e359a91..3ebd2a88 100644 --- a/kbabel/common/msgfmt.cpp +++ b/kbabel/common/msgfmt.cpp @@ -33,7 +33,7 @@ #include "msgfmt.h" #include <tdeapplication.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tqfileinfo.h> #include <tqdir.h> @@ -58,10 +58,10 @@ Msgfmt::Status Msgfmt::checkSyntax(TQString file,TQString& output, bool gnu) TDEProcess proc; - connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this,TQT_SLOT(addToOutput(TDEProcess*,char *, int ))); - connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this,TQT_SLOT(addToOutput(TDEProcess*,char *, int))); + connect(&proc,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this,TQ_SLOT(addToOutput(TDEProcess*,char *, int ))); + connect(&proc,TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this,TQ_SLOT(addToOutput(TDEProcess*,char *, int))); // remove last output _output=""; @@ -100,10 +100,10 @@ Msgfmt::Status Msgfmt::checkSyntaxInDir(TQString dir,TQString regexp,TQString& o TDEProcess proc; proc.setUseShell(true); - connect(&proc,TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), - this,TQT_SLOT(addToOutput(TDEProcess*,char *, int ))); - connect(&proc,TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), - this,TQT_SLOT(addToOutput(TDEProcess*,char *, int))); + connect(&proc,TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), + this,TQ_SLOT(addToOutput(TDEProcess*,char *, int ))); + connect(&proc,TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), + this,TQ_SLOT(addToOutput(TDEProcess*,char *, int))); // remove last output _output=""; @@ -141,7 +141,7 @@ void Msgfmt::addToOutput(TDEProcess*,char *buffer, int buflen) TQString Msgfmt::tempSaveName() { - return kapp->tempSaveName("/tmp/kbabel_msgfmt.po"); + return tdeApp->tempSaveName("/tmp/kbabel_msgfmt.po"); } #include "msgfmt.moc" diff --git a/kbabel/common/msgfmt.h b/kbabel/common/msgfmt.h index 42e28a60..b474fe5d 100644 --- a/kbabel/common/msgfmt.h +++ b/kbabel/common/msgfmt.h @@ -34,7 +34,7 @@ #define MSGFMT_H #include <tqobject.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEProcess; class TQString; @@ -42,7 +42,7 @@ class TQString; namespace KBabel { -class KDE_EXPORT Msgfmt : private TQObject +class TDE_EXPORT Msgfmt : private TQObject { TQ_OBJECT diff --git a/kbabel/common/poinfo.cpp b/kbabel/common/poinfo.cpp index 17d930d9..95df4510 100644 --- a/kbabel/common/poinfo.cpp +++ b/kbabel/common/poinfo.cpp @@ -39,7 +39,7 @@ #include <tdeapplication.h> #include <tdeio/netaccess.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <ksavefile.h> #include <tqdatastream.h> @@ -399,7 +399,7 @@ ConversionStatus PoInfo::info(const TQString& url, PoInfo& info, TQStringList &w while( lexer->lastToken != T_EOF && success==OK) { - if( interactive ) kapp->processEvents(10); + if( interactive ) tdeApp->processEvents(10); if( stopStaticRead ) { @@ -639,7 +639,7 @@ bool PoInfo::findInFile( const TQString& url, FindOptions options ) } case T_MSGID: case T_MSGIDPLURAL: { - kapp->processEvents(10); + tdeApp->processEvents(10); // if stopped, return not found if( stopStaticRead ) diff --git a/kbabel/common/poinfo.h b/kbabel/common/poinfo.h index 70ba652a..775e2968 100644 --- a/kbabel/common/poinfo.h +++ b/kbabel/common/poinfo.h @@ -57,7 +57,7 @@ class FindOptions; /** * PO-file information class, with transparent caching of information. */ -class KDE_EXPORT PoInfo +class TDE_EXPORT PoInfo { public: int total; diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp index 8ac63cd4..3050d971 100644 --- a/kbabel/common/projectsettings.cpp +++ b/kbabel/common/projectsettings.cpp @@ -38,7 +38,7 @@ #include <tqstring.h> #include <tdeglobal.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdespell.h> diff --git a/kbabel/common/projectsettings.h b/kbabel/common/projectsettings.h index 556088dd..c8b379ec 100644 --- a/kbabel/common/projectsettings.h +++ b/kbabel/common/projectsettings.h @@ -117,7 +117,7 @@ struct SourceContextSettings */ namespace Defaults { - class KDE_EXPORT Spellcheck + class TDE_EXPORT Spellcheck { public: static TQString ignoreURL(); @@ -130,7 +130,7 @@ namespace Defaults static KSpellConfig* defaultsettings; }; - class KDE_EXPORT CatalogManager + class TDE_EXPORT CatalogManager { public: static TQString ignoreURL(); diff --git a/kbabel/common/regexpextractor.h b/kbabel/common/regexpextractor.h index 75b6e0d3..174416a2 100644 --- a/kbabel/common/regexpextractor.h +++ b/kbabel/common/regexpextractor.h @@ -39,12 +39,12 @@ #include <tqstringlist.h> #include <tqvaluelist.h> #include <tqregexp.h> -#include <kdemacros.h> +#include <tdemacros.h> namespace KBabel { -struct KDE_EXPORT MatchedEntryInfo{ +struct TDE_EXPORT MatchedEntryInfo{ uint index; TQString extracted; }; @@ -54,7 +54,7 @@ struct KDE_EXPORT MatchedEntryInfo{ * class to extract entries based on regexps from a string * @author Andrea Rizzi <rizzi@kde.org> */ -class KDE_EXPORT RegExpExtractor +class TDE_EXPORT RegExpExtractor { public: diff --git a/kbabel/common/tagextractor.h b/kbabel/common/tagextractor.h index d6018f37..bf178a47 100644 --- a/kbabel/common/tagextractor.h +++ b/kbabel/common/tagextractor.h @@ -43,7 +43,7 @@ namespace KBabel * class to extract tags from a string * @author Andrea Rizzi <rizzi@kde.org> */ -class KDE_EXPORT TagExtractor : public RegExpExtractor +class TDE_EXPORT TagExtractor : public RegExpExtractor { public: diff --git a/kbabel/commonui/cmdedit.cpp b/kbabel/commonui/cmdedit.cpp index e6db0b5b..4fcc675e 100644 --- a/kbabel/commonui/cmdedit.cpp +++ b/kbabel/commonui/cmdedit.cpp @@ -107,19 +107,19 @@ CmdEdit::CmdEdit(TQWidget* parent, const char* name) setMinimumSize(layout->sizeHint()); - connect(_addButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(addCmd()) ) ; - connect(_editButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(editCmd()) ); - connect(_removeButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(removeCmd()) ); - connect(_upButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(upCmd()) ) ; - connect(_downButton , TQT_SIGNAL(clicked()) , this , TQT_SLOT(downCmd()) ); - - connect(_commands , TQT_SIGNAL(highlighted(int)) , this, TQT_SLOT(cmdHighlighted(int)) ); - connect(_commandNames , TQT_SIGNAL(highlighted(int)) , this, TQT_SLOT(cmdNameHighlighted(int)) ); - connect(_commands , TQT_SIGNAL(selected(int)) , this, TQT_SLOT(editCmd()) ); - connect(_commandNames , TQT_SIGNAL(selected(int)) , this, TQT_SLOT(editCmd()) ); - - connect(_cmdEdit, TQT_SIGNAL(textChanged(const TQString&)) , this , TQT_SLOT(checkAdd()) ); - connect(_cmdNameEdit, TQT_SIGNAL(textChanged(const TQString&)) , this , TQT_SLOT(checkAdd()) ); + connect(_addButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(addCmd()) ) ; + connect(_editButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(editCmd()) ); + connect(_removeButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(removeCmd()) ); + connect(_upButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(upCmd()) ) ; + connect(_downButton , TQ_SIGNAL(clicked()) , this , TQ_SLOT(downCmd()) ); + + connect(_commands , TQ_SIGNAL(highlighted(int)) , this, TQ_SLOT(cmdHighlighted(int)) ); + connect(_commandNames , TQ_SIGNAL(highlighted(int)) , this, TQ_SLOT(cmdNameHighlighted(int)) ); + connect(_commands , TQ_SIGNAL(selected(int)) , this, TQ_SLOT(editCmd()) ); + connect(_commandNames , TQ_SIGNAL(selected(int)) , this, TQ_SLOT(editCmd()) ); + + connect(_cmdEdit, TQ_SIGNAL(textChanged(const TQString&)) , this , TQ_SLOT(checkAdd()) ); + connect(_cmdNameEdit, TQ_SIGNAL(textChanged(const TQString&)) , this , TQ_SLOT(checkAdd()) ); } void CmdEdit::setCommands(const TQStringList& commands,const TQStringList& commandNames) diff --git a/kbabel/commonui/context.cpp b/kbabel/commonui/context.cpp index 3d22cb2a..6b1719a7 100644 --- a/kbabel/commonui/context.cpp +++ b/kbabel/commonui/context.cpp @@ -72,7 +72,7 @@ SourceContext::SourceContext(TQWidget *parent, KBabel::Project::Ptr project): TQ { _referenceList.clear(); _referenceCombo = new TQComboBox( this ); - connect( _referenceCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(updateToSelected(int))); + connect( _referenceCombo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(updateToSelected(int))); _layout= new TQVBoxLayout(this); _layout->addWidget(_referenceCombo); @@ -278,7 +278,7 @@ bool SourceContext::loadPart() _view=0; return false; } - _part = static_cast<KTextEditor::Document *>( factory->create( TQT_TQOBJECT(this), 0, "KTextEditor::Document" ) ); + _part = static_cast<KTextEditor::Document *>( factory->create( this, 0, "KTextEditor::Document" ) ); if( !_part ) { @@ -289,8 +289,8 @@ bool SourceContext::loadPart() return false; } _view = _part->createView( this, 0 ); - _layout->addWidget(static_cast<TQWidget *>(_view), 1); - static_cast<TQWidget *>(_view)->show(); + _layout->addWidget(_view, 1); + _view->show(); return true; } diff --git a/kbabel/commonui/context.h b/kbabel/commonui/context.h index 50bd1b24..02b06cc7 100644 --- a/kbabel/commonui/context.h +++ b/kbabel/commonui/context.h @@ -74,7 +74,7 @@ struct ContextInfo * @note It requires a KPart implementing KTextEditor interface with selections. * @author Stanislav Visnovsky <visnovsky@kde.org> */ -class KDE_EXPORT SourceContext : public TQWidget +class TDE_EXPORT SourceContext : public TQWidget { TQ_OBJECT diff --git a/kbabel/commonui/finddialog.cpp b/kbabel/commonui/finddialog.cpp index 4f695fb4..797b6c71 100644 --- a/kbabel/commonui/finddialog.cpp +++ b/kbabel/commonui/finddialog.cpp @@ -106,7 +106,7 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) } _buttonGrp = new TQButtonGroup(3, TQt::Horizontal, i18n("Where to Search"), page); - connect(_buttonGrp,TQT_SIGNAL(clicked(int)), this, TQT_SLOT(inButtonsClicked(int))); + connect(_buttonGrp,TQ_SIGNAL(clicked(int)), this, TQ_SLOT(inButtonsClicked(int))); layout->addWidget(_buttonGrp); _inMsgid = new TQCheckBox(i18n("&Msgid"),_buttonGrp); @@ -136,8 +136,8 @@ FindDialog::FindDialog(bool forReplace, TQWidget* parent) if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { _regExpButton = new TQPushButton( i18n("&Edit..."), regexp ); - connect( _regExpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( regExpButtonClicked())); - connect( _isRegExp, TQT_SIGNAL( toggled(bool) ), _regExpButton, TQT_SLOT(setEnabled(bool))); + connect( _regExpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( regExpButtonClicked())); + connect( _isRegExp, TQ_SIGNAL( toggled(bool) ), _regExpButton, TQ_SLOT(setEnabled(bool))); } if(forReplace) @@ -520,7 +520,7 @@ void FindDialog::inButtonsClicked(int id) void FindDialog::regExpButtonClicked() { if ( _regExpEditDialog == 0 ) - _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); + _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this ); KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog ); if( iface ) @@ -541,9 +541,9 @@ ReplaceDialog::ReplaceDialog(TQWidget* parent) TQLabel *label = new TQLabel(i18n("Replace this string?"),page); layout->addWidget(label); - connect(this,TQT_SIGNAL(user1Clicked()),this,TQT_SIGNAL(replace())); - connect(this,TQT_SIGNAL(user2Clicked()),this,TQT_SIGNAL(next())); - connect(this,TQT_SIGNAL(user3Clicked()),this,TQT_SIGNAL(replaceAll())); + connect(this,TQ_SIGNAL(user1Clicked()),this,TQ_SIGNAL(replace())); + connect(this,TQ_SIGNAL(user2Clicked()),this,TQ_SIGNAL(next())); + connect(this,TQ_SIGNAL(user3Clicked()),this,TQ_SIGNAL(replaceAll())); } ReplaceDialog::~ReplaceDialog() diff --git a/kbabel/commonui/finddialog.h b/kbabel/commonui/finddialog.h index b146e470..2044b155 100644 --- a/kbabel/commonui/finddialog.h +++ b/kbabel/commonui/finddialog.h @@ -44,7 +44,7 @@ class KComboBox; #include "findoptions.h" -class KDE_EXPORT FindDialog : public KDialogBase +class TDE_EXPORT FindDialog : public KDialogBase { TQ_OBJECT @@ -120,7 +120,7 @@ private: bool _replaceDlg; }; -class KDE_EXPORT ReplaceDialog : public KDialogBase +class TDE_EXPORT ReplaceDialog : public KDialogBase { TQ_OBJECT diff --git a/kbabel/commonui/projectpref.cpp b/kbabel/commonui/projectpref.cpp index 1f53f2f1..7d940acb 100644 --- a/kbabel/commonui/projectpref.cpp +++ b/kbabel/commonui/projectpref.cpp @@ -82,15 +82,15 @@ ProjectDialog::ProjectDialog(Project::Ptr project) addPage(_spellPage, i18n("title of page in preferences dialog","Spelling") , "tools-check-spelling" , i18n("Options for Spell Checking")); - connect( _spellPage, TQT_SIGNAL( settingsChanged() ) - , this, TQT_SLOT(updateButtons()) ); + connect( _spellPage, TQ_SIGNAL( settingsChanged() ) + , this, TQ_SLOT(updateButtons()) ); _sourcePage = new SourceContextPreferences(0); addPage(_sourcePage, i18n("title of page in preferences dialog","Source") , "text-x-src" ,i18n("Options for Showing Source Context")); - connect(_sourcePage, TQT_SIGNAL (itemsChanged()) - , this, TQT_SLOT (updateButtons()) ); + connect(_sourcePage, TQ_SIGNAL (itemsChanged()) + , this, TQ_SLOT (updateButtons()) ); _miscPage = new MiscPreferences(0); addPage(_miscPage, i18n("title of page in preferences dialog","Miscellaneous") @@ -106,15 +106,15 @@ ProjectDialog::ProjectDialog(Project::Ptr project) addPage(_dirCommandsPage, i18n("title of page in preferences dialog","Folder Commands") , "folder" , i18n("User-Defined Commands for Folder Items")); - connect( _dirCommandsPage, TQT_SIGNAL( settingsChanged() ), - this, TQT_SLOT(updateButtons()) ); + connect( _dirCommandsPage, TQ_SIGNAL( settingsChanged() ), + this, TQ_SLOT(updateButtons()) ); _fileCommandsPage = new FileCommandsPreferences(0); addPage(_fileCommandsPage, i18n("title of page in preferences dialog","File Commands") , "files" , i18n("User-Defined Commands for File Items")); - connect( _fileCommandsPage, TQT_SIGNAL( settingsChanged() ), - this, TQT_SLOT(updateButtons()) ); + connect( _fileCommandsPage, TQ_SIGNAL( settingsChanged() ), + this, TQ_SLOT(updateButtons()) ); _viewPage = new ViewPreferences(0); addPage(_viewPage, i18n("title of page in preferences dialog","Catalog Manager") diff --git a/kbabel/commonui/projectpref.h b/kbabel/commonui/projectpref.h index b7f571e3..44767b47 100644 --- a/kbabel/commonui/projectpref.h +++ b/kbabel/commonui/projectpref.h @@ -55,7 +55,7 @@ class DiffPreferences; namespace KBabel { -class KDE_EXPORT ProjectDialog : public TDEConfigDialog +class TDE_EXPORT ProjectDialog : public TDEConfigDialog { TQ_OBJECT diff --git a/kbabel/commonui/projectprefwidgets.cpp b/kbabel/commonui/projectprefwidgets.cpp index 203d28c0..53be602c 100644 --- a/kbabel/commonui/projectprefwidgets.cpp +++ b/kbabel/commonui/projectprefwidgets.cpp @@ -220,7 +220,7 @@ SavePreferences::SavePreferences(TQWidget *parent) _dateFormatEdit = new TQLineEdit(dateBox, "kcfg_CustomDateFormat"); _dateFormatEdit->setEnabled(false); - connect( _customDateButton, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT( customDateActivated(bool) ) ); + connect( _customDateButton, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT( customDateActivated(bool) ) ); TQGroupBox* projectBox = new TQGroupBox(1,TQt::Horizontal,i18n("Project String") ,page); @@ -438,8 +438,8 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje tempLabel=new TQLabel(i18n("Lan&guage code:"),hbox); _langCodeEdit = new TQLineEdit(hbox, "kcfg_LanguageCode"); tempLabel->setBuddy(_langCodeEdit); - connect(_langCodeEdit,TQT_SIGNAL(textChanged(const TQString&)), this - , TQT_SLOT(checkTestPluralButton())); + connect(_langCodeEdit,TQ_SIGNAL(textChanged(const TQString&)), this + , TQ_SLOT(checkTestPluralButton())); tempLabel=new TQLabel(i18n("&Language mailing list:"),group); _listEdit = new TQLineEdit(group, "kcfg_Mailinglist"); @@ -473,15 +473,15 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje _pluralFormsBox->setSpecialValueText( i18n("automatic choose number of plural forms","Automatic")); label->setBuddy(_pluralFormsBox); - connect(_pluralFormsBox,TQT_SIGNAL(valueChanged(int)), this - , TQT_SLOT(checkTestPluralButton())); + connect(_pluralFormsBox,TQ_SIGNAL(valueChanged(int)), this + , TQ_SLOT(checkTestPluralButton())); hbox->setStretchFactor(_pluralFormsBox,1); _testPluralButton = new TQPushButton(i18n("Te&st"),hbox); _testPluralButton->setEnabled(false); - connect(_testPluralButton, TQT_SIGNAL(clicked()), this - , TQT_SLOT(testPluralForm())); + connect(_testPluralButton, TQ_SIGNAL(clicked()), this + , TQ_SLOT(testPluralForm())); const TQString msg=i18n("<qt><p><b>Number of singular/plural forms</b></p>" "<p><b>Note</b>: This option is TDE specific. " @@ -512,8 +512,8 @@ IdentityPreferences::IdentityPreferences(TQWidget* parent, const TQString& proje hbox->setStretchFactor(_gnuPluralFormHeaderEdit,1); _testGnuPluralFormButton = new TQPushButton(i18n("&Lookup"),hbox); - connect(_testGnuPluralFormButton, TQT_SIGNAL(clicked()), this - , TQT_SLOT(lookupGnuPluralFormHeader())); + connect(_testGnuPluralFormButton, TQ_SIGNAL(clicked()), this + , TQ_SLOT(lookupGnuPluralFormHeader())); _checkPluralArgumentBox = new TQCheckBox( i18n("Re&quire plural form arguments in translation") , group, "kcfg_CheckPluralArgument" ); @@ -706,7 +706,7 @@ MiscPreferences::MiscPreferences(TQWidget *parent) if( !TDETrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty() ) { _regExpButton = new TQPushButton( i18n("&Edit..."), hbox ); - connect( _regExpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( regExpButtonClicked())); + connect( _regExpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( regExpButtonClicked())); } @@ -778,7 +778,7 @@ void MiscPreferences::regExpButtonClicked() { if ( _regExpEditDialog==0 ) _regExpEditDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog> - ("KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); + ("KRegExpEditor/KRegExpEditor", TQString(), this ); KRegExpEditorInterface *iface = dynamic_cast<KRegExpEditorInterface *>( _regExpEditDialog ); if( iface ) @@ -811,8 +811,8 @@ SpellPreferences::SpellPreferences(TQWidget* parent) remIgnoredBtn = new TQCheckBox(i18n("&Remember ignored words"),page, "kcfg_RememberIgnored"); layout->addWidget(remIgnoredBtn); - connect( spellConfig, TQT_SIGNAL( configChanged() ) - , this, TQT_SIGNAL ( settingsChanged() ) ); + connect( spellConfig, TQ_SIGNAL( configChanged() ) + , this, TQ_SIGNAL ( settingsChanged() ) ); TQLabel *tempLabel = new TQLabel(i18n("F&ile to store ignored words:"),page); layout->addWidget(tempLabel); @@ -820,8 +820,8 @@ SpellPreferences::SpellPreferences(TQWidget* parent) layout->addWidget(ignoreURLEdit); tempLabel->setBuddy(ignoreURLEdit); - connect(remIgnoredBtn,TQT_SIGNAL(toggled(bool)),ignoreURLEdit - ,TQT_SLOT(setEnabled(bool))); + connect(remIgnoredBtn,TQ_SIGNAL(toggled(bool)),ignoreURLEdit + ,TQ_SLOT(setEnabled(bool))); TQString msg = i18n("<qt><p><b>Remember ignored words</b></p>" @@ -993,7 +993,7 @@ DirCommandsPreferences::DirCommandsPreferences(TQWidget* parent) new TQLabel( i18n("Replaceables:\n@PACKAGE@, @PODIR@, @POTDIR@\n" "@POFILES@, @MARKEDPOFILES@"), box); - connect (_dirCmdEdit, TQT_SIGNAL(widgetChanged()), this, TQT_SIGNAL(settingsChanged())); + connect (_dirCmdEdit, TQ_SIGNAL(widgetChanged()), this, TQ_SIGNAL(settingsChanged())); TQWhatsThis::add( box , i18n("<qt><p><b>Commands for folders</b></p>" "<p>Insert here the commands you want to execute in folders from " @@ -1056,7 +1056,7 @@ FileCommandsPreferences::FileCommandsPreferences(TQWidget* parent) new TQLabel( i18n("Replaceables:\n" "@PACKAGE@, @POFILE@,@POTFILE@,\n@PODIR@, @POTDIR@"), box); - connect (_fileCmdEdit, TQT_SIGNAL(widgetChanged()), this, TQT_SIGNAL(settingsChanged())); + connect (_fileCmdEdit, TQ_SIGNAL(widgetChanged()), this, TQ_SIGNAL(settingsChanged())); TQWhatsThis::add( box , i18n("<qt><p><b>Commands for files</b></p>" "<p>Insert here the commands you want to execute on files from " @@ -1168,8 +1168,8 @@ SourceContextPreferences::SourceContextPreferences(TQWidget* parent): TQWidget(p _pathsEditor->setTitle(i18n("Path Patterns")); layout->addWidget(_pathsEditor); - connect ( _pathsEditor, TQT_SIGNAL (itemsChanged ()) - , this, TQT_SIGNAL (itemsChanged ())); + connect ( _pathsEditor, TQ_SIGNAL (itemsChanged ()) + , this, TQ_SIGNAL (itemsChanged ())); _pathsEditor->installEventFilter(this); diff --git a/kbabel/commonui/projectprefwidgets.h b/kbabel/commonui/projectprefwidgets.h index b5ccf7d0..1b523b6c 100644 --- a/kbabel/commonui/projectprefwidgets.h +++ b/kbabel/commonui/projectprefwidgets.h @@ -62,7 +62,7 @@ class KURLRequester; struct ModuleInfo; -class KDE_EXPORT SavePreferences : public KTabCtl +class TDE_EXPORT SavePreferences : public KTabCtl { TQ_OBJECT diff --git a/kbabel/commonui/projectwizard.cpp b/kbabel/commonui/projectwizard.cpp index 79266489..9bb8dcec 100644 --- a/kbabel/commonui/projectwizard.cpp +++ b/kbabel/commonui/projectwizard.cpp @@ -71,9 +71,9 @@ ProjectWizard::ProjectWizard(TQWidget *parent,const char *name) } } - connect( _wizard->_projectName, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(textChanged(const TQString &))); - connect( _wizard->_projectFile, TQT_SIGNAL(textChanged(const TQString &)), this, TQT_SLOT(textChanged(const TQString &))); - connect( this, TQT_SIGNAL( helpClicked( void ) ), this, TQT_SLOT( slotHelpClicked( void ) ) ); + connect( _wizard->_projectName, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(textChanged(const TQString &))); + connect( _wizard->_projectFile, TQ_SIGNAL(textChanged(const TQString &)), this, TQ_SLOT(textChanged(const TQString &))); + connect( this, TQ_SIGNAL( helpClicked( void ) ), this, TQ_SLOT( slotHelpClicked( void ) ) ); addPage(_wizard, i18n("Basic Project Information")); @@ -166,7 +166,7 @@ Project::Ptr ProjectWizard::newProject() void ProjectWizard::slotHelpClicked( void ) { - kapp->invokeHelp( "preferences-project-wizard", "kbabel" ); + tdeApp->invokeHelp( "preferences-project-wizard", "kbabel" ); } #include "projectwizard.moc" diff --git a/kbabel/commonui/projectwizard.h b/kbabel/commonui/projectwizard.h index cc2e3c9d..c0e07fe1 100644 --- a/kbabel/commonui/projectwizard.h +++ b/kbabel/commonui/projectwizard.h @@ -45,7 +45,7 @@ class ProjectStep2; namespace KBabel { -class KDE_EXPORT ProjectWizard : public KWizard +class TDE_EXPORT ProjectWizard : public KWizard { TQ_OBJECT diff --git a/kbabel/commonui/roughtransdlg.cpp b/kbabel/commonui/roughtransdlg.cpp index 654bee27..609dbdcd 100644 --- a/kbabel/commonui/roughtransdlg.cpp +++ b/kbabel/commonui/roughtransdlg.cpp @@ -103,7 +103,7 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat fuzzyButton = new TQCheckBox(i18n("&Fuzzy entries"),bBox); transButton = new TQCheckBox(i18n("T&ranslated entries"),bBox); - connect(bBox,TQT_SIGNAL(clicked(int)),this,TQT_SLOT(msgButtonClicked(int))); + connect(bBox,TQ_SIGNAL(clicked(int)),this,TQ_SLOT(msgButtonClicked(int))); TQWhatsThis::add(bBox,i18n("<qt><p><b>What entries to translate</b></p>" "<p>Choose here, for which entries of the file KBabel " @@ -144,8 +144,8 @@ RoughTransDlg::RoughTransDlg(KBabelDictBox *dict, Catalog *cat "you know what you are doing.</p></qt>")); - connect(markFuzzyButton, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(fuzzyButtonToggled(bool))); + connect(markFuzzyButton, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(fuzzyButtonToggled(bool))); kdeButton = new TQCheckBox(i18n("Initialize &TDE-specific entries"),box); kdeButton->setChecked(true); @@ -249,7 +249,7 @@ void RoughTransDlg::slotUser1() partTransCounter=0; totalTried=0; - TQTimer::singleShot(0,this, TQT_SLOT(translate())); + TQTimer::singleShot(0,this, TQ_SLOT(translate())); } void RoughTransDlg::translate() @@ -278,7 +278,7 @@ void RoughTransDlg::translate() for(int i = 0; i < total; i++) { progressbar->setProgress(i+1); - kapp->processEvents(100); + tdeApp->processEvents(100); if(stop || cancel) break; diff --git a/kbabel/commonui/roughtransdlg.h b/kbabel/commonui/roughtransdlg.h index 8c51d614..f18110c2 100644 --- a/kbabel/commonui/roughtransdlg.h +++ b/kbabel/commonui/roughtransdlg.h @@ -50,7 +50,7 @@ class TQHButtonGroup; class TQRadioButton; class TQVBox; -class KDE_EXPORT RoughTransDlg : public KDialogBase +class TDE_EXPORT RoughTransDlg : public KDialogBase { TQ_OBJECT diff --git a/kbabel/commonui/tdeactionselector.cpp b/kbabel/commonui/tdeactionselector.cpp index 7cb5160c..27fcd215 100644 --- a/kbabel/commonui/tdeactionselector.cpp +++ b/kbabel/commonui/tdeactionselector.cpp @@ -109,18 +109,18 @@ TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) loadIcons(); - connect( d->btnAdd, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonAddClicked()) ); - connect( d->btnRemove, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonRemoveClicked()) ); - connect( d->btnUp, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonUpClicked()) ); - connect( d->btnDown, TQT_SIGNAL(clicked()), this, TQT_SLOT(buttonDownClicked()) ); - connect( d->availableListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->selectedListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), - this, TQT_SLOT(itemDoubleClicked(TQListBoxItem*)) ); - connect( d->availableListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); - connect( d->selectedListBox, TQT_SIGNAL(currentChanged(TQListBoxItem*)), - this, TQT_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->btnAdd, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonAddClicked()) ); + connect( d->btnRemove, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonRemoveClicked()) ); + connect( d->btnUp, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonUpClicked()) ); + connect( d->btnDown, TQ_SIGNAL(clicked()), this, TQ_SLOT(buttonDownClicked()) ); + connect( d->availableListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->selectedListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), + this, TQ_SLOT(itemDoubleClicked(TQListBoxItem*)) ); + connect( d->availableListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); + connect( d->selectedListBox, TQ_SIGNAL(currentChanged(TQListBoxItem*)), + this, TQ_SLOT(slotCurrentChanged(TQListBoxItem *)) ); d->availableListBox->installEventFilter( this ); d->selectedListBox->installEventFilter( this ); diff --git a/kbabel/commonui/tdelisteditor.ui b/kbabel/commonui/tdelisteditor.ui index a3130a1f..e0a7de23 100644 --- a/kbabel/commonui/tdelisteditor.ui +++ b/kbabel/commonui/tdelisteditor.ui @@ -242,10 +242,10 @@ <includes> <include location="local" impldecl="in implementation">tdelisteditor.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>itemsChanged()</signal> -</Q_SIGNALS> -<Q_SLOTS> +</signals> +<slots> <slot>addToList()</slot> <slot>downInList()</slot> <slot>removeFromList()</slot> @@ -256,6 +256,6 @@ <slot access="protected">editChanged( const TQString & s )</slot> <slot>setTitle( const TQString & s )</slot> <slot returnType="TQStringList">list()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/commonui/toolaction.cpp b/kbabel/commonui/toolaction.cpp index 6e594834..d9245239 100644 --- a/kbabel/commonui/toolaction.cpp +++ b/kbabel/commonui/toolaction.cpp @@ -76,7 +76,7 @@ TQPtrList<TDEAction> ToolAction::dataToolActionList( const TQValueList<KDataTool ToolAction * action = new ToolAction( *uit, (sc.isEmpty()?TQString():sc), *entry, *cit , parent , TQString(namePrefix+(*entry).service()->library()+"_"+(*cit)).utf8() ); - connect( action, TQT_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), + connect( action, TQ_SIGNAL( toolActivated( const KDataToolInfo &, const TQString & ) ), receiver, slot ); actionList.append( action ); diff --git a/kbabel/commonui/toolaction.h b/kbabel/commonui/toolaction.h index de0f0227..de0fb688 100644 --- a/kbabel/commonui/toolaction.h +++ b/kbabel/commonui/toolaction.h @@ -39,7 +39,7 @@ class TDEShortcut; class TDEActionCollection; -class KDE_EXPORT ToolAction : public TDEAction +class TDE_EXPORT ToolAction : public TDEAction { TQ_OBJECT diff --git a/kbabel/commonui/toolselectionwidget.h b/kbabel/commonui/toolselectionwidget.h index 8d11628f..9187715c 100644 --- a/kbabel/commonui/toolselectionwidget.h +++ b/kbabel/commonui/toolselectionwidget.h @@ -33,11 +33,11 @@ #define TOOLSELECTIONWIDGET_H #include "tdeactionselector.h" -#include <kdemacros.h> +#include <tdemacros.h> class KDataToolInfo; -class KDE_EXPORT ToolSelectionWidget : public TDEActionSelector +class TDE_EXPORT ToolSelectionWidget : public TDEActionSelector { TQ_OBJECT diff --git a/kbabel/datatools/accelerators/main.cpp b/kbabel/datatools/accelerators/main.cpp index 0c7cae3a..476bbdfd 100644 --- a/kbabel/datatools/accelerators/main.cpp +++ b/kbabel/datatools/accelerators/main.cpp @@ -64,20 +64,20 @@ bool AcceleratorTool::run( const TQString& command, void* data, const TQString& { kdDebug(KBABEL) << "Accelerator Tool does only accept the command 'validate'" << endl; kdDebug(KBABEL) << " The commands " << command << " is not accepted" << endl; - return FALSE; + return false; } // Check wether we can accept the data if ( datatype != "CatalogItem" ) { kdDebug(KBABEL) << "Accelerator Tool only accepts datatype CatalogItem" << endl; - return FALSE; + return false; } if ( mimetype != "application/x-kbabel-catalogitem" ) { kdDebug(KBABEL) << "Accelerator Tool only accepts mimetype application/x-kbabel-catalogitem" << endl; - return FALSE; + return false; } if( command == "validate" ) @@ -131,7 +131,7 @@ bool AcceleratorTool::run( const TQString& command, void* data, const TQString& return !hasError; } - return FALSE; + return false; } #include "main.moc" diff --git a/kbabel/datatools/arguments/main.cpp b/kbabel/datatools/arguments/main.cpp index b6c3fa5a..66896fbc 100644 --- a/kbabel/datatools/arguments/main.cpp +++ b/kbabel/datatools/arguments/main.cpp @@ -63,20 +63,20 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat { kdDebug(KBABEL) << "Argument Tool does only accept the command 'validate' and 'shortcut'" << endl; kdDebug(KBABEL) << " The commands " << command << " is not accepted" << endl; - return FALSE; + return false; } // Check wether we can accept the data if ( datatype != "CatalogItem" ) { kdDebug(KBABEL) << "Argument Tool only accepts datatype CatalogItem" << endl; - return FALSE; + return false; } if ( mimetype != "application/x-kbabel-catalogitem" ) { kdDebug(KBABEL) << "Argument Tool only accepts mimetype application/x-kbabel-catalogitem" << endl; - return FALSE; + return false; } if( command == "validate" ) @@ -271,7 +271,7 @@ bool ArgumentTool::run( const TQString& command, void* data, const TQString& dat return !hasError; } - return FALSE; + return false; } #include "main.moc" diff --git a/kbabel/datatools/context/main.cpp b/kbabel/datatools/context/main.cpp index 0fb989d2..109b1084 100644 --- a/kbabel/datatools/context/main.cpp +++ b/kbabel/datatools/context/main.cpp @@ -64,20 +64,20 @@ bool ContextTool::run( const TQString& command, void* data, const TQString& data { kdDebug(KBABEL) << "Context Tool does only accept the command 'validate' and 'shortcut'" << endl; kdDebug(KBABEL) << " The commands " << command << " is not accepted" << endl; - return FALSE; + return false; } // Check wether we can accept the data if ( datatype != "CatalogItem" ) { kdDebug(KBABEL) << "Context Tool only accepts datatype CatalogItem" << endl; - return FALSE; + return false; } if ( mimetype != "application/x-kbabel-catalogitem" ) { kdDebug(KBABEL) << "Context Tool only accepts mimetype application/x-kbabel-catalogitem" << endl; - return FALSE; + return false; } if( command == "validate" ) @@ -109,7 +109,7 @@ bool ContextTool::run( const TQString& command, void* data, const TQString& data return !hasError; } - return FALSE; + return false; } #include "main.moc" diff --git a/kbabel/datatools/equations/main.cpp b/kbabel/datatools/equations/main.cpp index c0dbbba2..895bbd2d 100644 --- a/kbabel/datatools/equations/main.cpp +++ b/kbabel/datatools/equations/main.cpp @@ -64,20 +64,20 @@ bool EquationsTool::run( const TQString& command, void* data, const TQString& da { kdDebug(KBABEL) << "Equations Tool does only accept the command 'validate' and 'shortcut'" << endl; kdDebug(KBABEL) << " The commands " << command << " is not accepted" << endl; - return FALSE; + return false; } // Check wether we can accept the data if ( datatype != "CatalogItem" ) { kdDebug(KBABEL) << "Equations Tool only accepts datatype CatalogItem" << endl; - return FALSE; + return false; } if ( mimetype != "application/x-kbabel-catalogitem" ) { kdDebug(KBABEL) << "Equations Tool only accepts mimetype application/x-kbabel-catalogitem" << endl; - return FALSE; + return false; } if( command == "validate" ) @@ -107,7 +107,7 @@ bool EquationsTool::run( const TQString& command, void* data, const TQString& da return !hasError; } - return FALSE; + return false; } #include "main.moc" diff --git a/kbabel/datatools/pluralforms/main.cpp b/kbabel/datatools/pluralforms/main.cpp index 693a843b..65057631 100644 --- a/kbabel/datatools/pluralforms/main.cpp +++ b/kbabel/datatools/pluralforms/main.cpp @@ -65,20 +65,20 @@ bool PluralsTool::run( const TQString& command, void* data, const TQString& data { kdDebug(KBABEL) << "Plural Forms Tool does only accept the command 'validate' and 'shortcut'" << endl; kdDebug(KBABEL) << " The commands " << command << " is not accepted" << endl; - return FALSE; + return false; } // Check wether we can accept the data if ( datatype != "CatalogItem" ) { kdDebug(KBABEL) << "Plural Forms Tool only accepts datatype CatalogItem" << endl; - return FALSE; + return false; } if ( mimetype != "application/x-kbabel-catalogitem" ) { kdDebug(KBABEL) << "Plural Forms Tool only accepts mimetype application/x-kbabel-catalogitem" << endl; - return FALSE; + return false; } if( command == "validate" ) @@ -123,7 +123,7 @@ bool PluralsTool::run( const TQString& command, void* data, const TQString& data return !hasError; } - return FALSE; + return false; } #include "main.moc" diff --git a/kbabel/datatools/punctuation/main.cpp b/kbabel/datatools/punctuation/main.cpp index 6d779518..7f86e0ce 100644 --- a/kbabel/datatools/punctuation/main.cpp +++ b/kbabel/datatools/punctuation/main.cpp @@ -64,20 +64,20 @@ bool PunctuationTool::run( const TQString& command, void* data, const TQString& { kdDebug(KBABEL) << "Punctuation Tool does only accept the command 'validate'" << endl; kdDebug(KBABEL) << " The commands " << command << " is not accepted" << endl; - return FALSE; + return false; } // Check wether we can accept the data if ( datatype != "CatalogItem" ) { kdDebug(KBABEL) << "Punctuation Tool only accepts datatype CatalogItem" << endl; - return FALSE; + return false; } if ( mimetype != "application/x-kbabel-catalogitem" ) { kdDebug(KBABEL) << "Punctuation Tool only accepts mimetype application/x-kbabel-catalogitem" << endl; - return FALSE; + return false; } if( command == "validate" ) @@ -151,7 +151,7 @@ bool PunctuationTool::run( const TQString& command, void* data, const TQString& return !hasError; } - return FALSE; + return false; } #include "main.moc" diff --git a/kbabel/datatools/setfuzzy/main.cpp b/kbabel/datatools/setfuzzy/main.cpp index 7bc0ed16..8ff83492 100644 --- a/kbabel/datatools/setfuzzy/main.cpp +++ b/kbabel/datatools/setfuzzy/main.cpp @@ -60,20 +60,20 @@ bool SetFuzzyTool::run( const TQString& command, void* data, const TQString& dat { kdDebug(KBABEL) << "Fuzzy Toggling Tool does only accept the command 'allfuzzy'" << endl; kdDebug(KBABEL) << " The commands " << command << " is not accepted" << endl; - return FALSE; + return false; } // Check wether we can accept the data if ( datatype != "Catalog" ) { kdDebug(KBABEL) << "Fuzzy Toggling Tool only accepts datatype Catalog" << endl; - return FALSE; + return false; } if ( mimetype != "application/x-kbabel-catalog" ) { kdDebug(KBABEL) << "Plural Forms Tool only accepts mimetype application/x-kbabel-catalog" << endl; - return FALSE; + return false; } if( command == "allfuzzy" ) @@ -92,7 +92,7 @@ bool SetFuzzyTool::run( const TQString& command, void* data, const TQString& dat catalog->applyEndCommand(0,Msgstr,0); } - return TRUE; + return true; } #include "main.moc" diff --git a/kbabel/datatools/xml/main.cpp b/kbabel/datatools/xml/main.cpp index 59342c0d..07b65c3b 100644 --- a/kbabel/datatools/xml/main.cpp +++ b/kbabel/datatools/xml/main.cpp @@ -66,20 +66,20 @@ bool XMLTool::run( const TQString& command, void* data, const TQString& datatype { kdDebug(KBABEL) << "XML Tool does only accept the command 'validate' and 'shortcut'" << endl; kdDebug(KBABEL) << " The commands " << command << " is not accepted" << endl; - return FALSE; + return false; } // Check wether we can accept the data if ( datatype != "CatalogItem" ) { kdDebug(KBABEL) << "XML Tool only accepts datatype CatalogItem" << endl; - return FALSE; + return false; } if ( mimetype != "application/x-kbabel-catalogitem" ) { kdDebug(KBABEL) << "XML Tool only accepts mimetype application/x-kbabel-catalogitem" << endl; - return FALSE; + return false; } if( command == "validate" ) @@ -168,7 +168,7 @@ bool XMLTool::run( const TQString& command, void* data, const TQString& datatype return !hasError; } - return FALSE; + return false; } bool XMLTool::isFullyCompliant( const TQString& text) diff --git a/kbabel/filters/gettext/gettextexport.cpp b/kbabel/filters/gettext/gettextexport.cpp index 9b08bfd2..e0695bea 100644 --- a/kbabel/filters/gettext/gettextexport.cpp +++ b/kbabel/filters/gettext/gettextexport.cpp @@ -164,7 +164,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS stream << "\n"; - kapp->processEvents(10); + tdeApp->processEvents(10); if( isStopped() ) { return STOPPED; @@ -181,7 +181,7 @@ ConversionStatus GettextExportPlugin::save(const TQString& localFile , const TQS { stream << (*oit) << "\n\n"; - kapp->processEvents(10); + tdeApp->processEvents(10); if( isStopped() ) { return STOPPED; diff --git a/kbabel/filters/gettext/gettextimport.cpp b/kbabel/filters/gettext/gettextimport.cpp index fb59fb4b..1f3ace87 100644 --- a/kbabel/filters/gettext/gettextimport.cpp +++ b/kbabel/filters/gettext/gettextimport.cpp @@ -171,7 +171,7 @@ ConversionStatus GettextImportPlugin::load(const TQString& filename, const TQStr while( !stream.eof() ) { - kapp->processEvents(10); + tdeApp->processEvents(10); if( isStopped() ) { return STOPPED; diff --git a/kbabel/kbabel/charselectview.cpp b/kbabel/kbabel/charselectview.cpp index 4522201e..8214dcf9 100644 --- a/kbabel/kbabel/charselectview.cpp +++ b/kbabel/kbabel/charselectview.cpp @@ -74,11 +74,11 @@ CharacterSelectorView::CharacterSelectorView(KBCatalog* catalog,TQWidget *parent scroll->addChild(_table); layout->addWidget (scroll); - connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) ); - connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) )); + connect( _table, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( emitChar() ) ); + connect( _tableNum, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( setTab(int) )); - connect( _catalog, TQT_SIGNAL( signalFileOpened(bool) ), this, TQT_SLOT (setDisabled (bool))); - connect( _catalog, TQT_SIGNAL( signalFileOpened(bool) ), _table, TQT_SLOT (setDisabled (bool))); + connect( _catalog, TQ_SIGNAL( signalFileOpened(bool) ), this, TQ_SLOT (setDisabled (bool))); + connect( _catalog, TQ_SIGNAL( signalFileOpened(bool) ), _table, TQ_SLOT (setDisabled (bool))); TQWhatsThis::add(this, i18n("<qt><p><b>Character Selector</b></p>" diff --git a/kbabel/kbabel/commentview.cpp b/kbabel/kbabel/commentview.cpp index 0ca858d3..27ac26fd 100644 --- a/kbabel/kbabel/commentview.cpp +++ b/kbabel/kbabel/commentview.cpp @@ -94,12 +94,12 @@ Hints from other translators are also sometimes contained in comments.</p>\n\ <b>Options->Show Comments</b>.</p></qt>")); commentEdit->setReadOnly(true); - connect(commentEdit,TQT_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQT_SLOT(forwardCommentEditCmd(KBabel::EditCommand*))); + connect(commentEdit,TQ_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQ_SLOT(forwardCommentEditCmd(KBabel::EditCommand*))); - connect(commentEdit,TQT_SIGNAL(cursorPositionChanged(int,int)) - , this, TQT_SIGNAL(signalCursorPosChanged(int,int))); + connect(commentEdit,TQ_SIGNAL(cursorPositionChanged(int,int)) + , this, TQ_SIGNAL(signalCursorPosChanged(int,int))); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)), this, TQ_SLOT(setDisabled(bool))); } void CommentView::update(EditCommand* cmd, bool undo) diff --git a/kbabel/kbabel/contextview.cpp b/kbabel/kbabel/contextview.cpp index de5263a9..c6839480 100644 --- a/kbabel/kbabel/contextview.cpp +++ b/kbabel/kbabel/contextview.cpp @@ -67,7 +67,7 @@ ContextView::ContextView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje "<p>You can hide the tools window by deactivating " "<b>Options->Show Tools</b>.</p></qt></qt>")); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)), this, TQ_SLOT(setDisabled(bool))); } void ContextView::updateView() diff --git a/kbabel/kbabel/editorpreferences.ui b/kbabel/kbabel/editorpreferences.ui index e0f4a612..3215a696 100644 --- a/kbabel/kbabel/editorpreferences.ui +++ b/kbabel/kbabel/editorpreferences.ui @@ -342,9 +342,9 @@ activated, you will still see a message in the statusbar. <include location="global" impldecl="in implementation">kcolorbutton.h</include> <include location="local" impldecl="in implementation">editorpreferences.ui.h</include> </includes> -<Q_SLOTS> +<slots> <slot specifier="non virtual">ledWarning( bool show )</slot> <slot specifier="non virtual">toggleOther( bool other )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/fontpreferences.ui b/kbabel/kbabel/fontpreferences.ui index 404f0580..a6998eb7 100644 --- a/kbabel/kbabel/fontpreferences.ui +++ b/kbabel/kbabel/fontpreferences.ui @@ -57,8 +57,8 @@ <include location="local" impldecl="in implementation">fontpreferences.ui.h</include> <include location="global" impldecl="in implementation">tdefontdialog.h</include> </includes> -<Q_SLOTS> +<slots> <slot access="private">showOnlyFixedFonts( bool on )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kbabel/kbabel/headereditor.cpp b/kbabel/kbabel/headereditor.cpp index 4a7624cb..9b63f071 100644 --- a/kbabel/kbabel/headereditor.cpp +++ b/kbabel/kbabel/headereditor.cpp @@ -54,8 +54,8 @@ HeaderEditor::HeaderEditor(Catalog* cat,const char* name) restoreSettings(); _catalog=cat; - connect(_catalog,TQT_SIGNAL(signalFileOpened(bool)),this,TQT_SLOT(readHeader(bool))); - connect(_catalog,TQT_SIGNAL(signalHeaderChanged()),this,TQT_SLOT(updateHeader())); + connect(_catalog,TQ_SIGNAL(signalFileOpened(bool)),this,TQ_SLOT(readHeader(bool))); + connect(_catalog,TQ_SIGNAL(signalHeaderChanged()),this,TQ_SLOT(updateHeader())); setButtonText(User1,i18n("&Apply Settings")); setButtonWhatsThis (User1, i18n("<qt><p>This button " diff --git a/kbabel/kbabel/hidingmsgedit.cpp b/kbabel/kbabel/hidingmsgedit.cpp index 11bf219c..13d3ce2f 100644 --- a/kbabel/kbabel/hidingmsgedit.cpp +++ b/kbabel/kbabel/hidingmsgedit.cpp @@ -54,8 +54,8 @@ HidingMsgEdit::HidingMsgEdit(uint numberOfPlurals, TQWidget* eventFilter, KSpell _allEdits.clear(); setNumberOfPlurals( _numberOfPlurals ); - connect( _multipleEdit, TQT_SIGNAL(currentChanged( TQWidget* )), - this, TQT_SLOT( newCurrentMultiple( TQWidget* ))); + connect( _multipleEdit, TQ_SIGNAL(currentChanged( TQWidget* )), + this, TQ_SLOT( newCurrentMultiple( TQWidget* ))); showSingle(); } @@ -189,12 +189,12 @@ void HidingMsgEdit::setNumberOfPlurals( uint numberOfPlurals ) for( MsgMultiLineEdit* e = _allEdits.first() ; e ; e = _allEdits.next() ) { - connect( e, TQT_SIGNAL( signalUndoCmd( KBabel::EditCommand* )), - this, TQT_SIGNAL( signalUndoCmd( KBabel::EditCommand* ))); - connect( e, TQT_SIGNAL( textChanged() ) , this, TQT_SIGNAL( textChanged() )); - connect( e, TQT_SIGNAL( textChanged() ) , this, TQT_SLOT( emitTextChanged() )); - connect( e, TQT_SIGNAL( cursorPositionChanged( int, int )), - this, TQT_SLOT( emitCursorPositionChanged( int, int )) ); + connect( e, TQ_SIGNAL( signalUndoCmd( KBabel::EditCommand* )), + this, TQ_SIGNAL( signalUndoCmd( KBabel::EditCommand* ))); + connect( e, TQ_SIGNAL( textChanged() ) , this, TQ_SIGNAL( textChanged() )); + connect( e, TQ_SIGNAL( textChanged() ) , this, TQ_SLOT( emitTextChanged() )); + connect( e, TQ_SIGNAL( cursorPositionChanged( int, int )), + this, TQ_SLOT( emitCursorPositionChanged( int, int )) ); } showPlurals( plurals ); diff --git a/kbabel/kbabel/kbabel.cpp b/kbabel/kbabel/kbabel.cpp index 2bf4b2a0..4666ba9a 100644 --- a/kbabel/kbabel/kbabel.cpp +++ b/kbabel/kbabel/kbabel.cpp @@ -171,8 +171,8 @@ void KBabelMW::init(KBCatalog* catalog) prefDialogs.setAutoDelete(true); _statusbarTimer = new TQTimer(this, "statusbartimer"); - connect(_statusbarTimer,TQT_SIGNAL(timeout()),this - ,TQT_SLOT(clearStatusbarMsg())); + connect(_statusbarTimer,TQ_SIGNAL(timeout()),this + ,TQ_SLOT(clearStatusbarMsg())); // FIXME: Q_ASSERT(_project); @@ -206,74 +206,74 @@ void KBabelMW::init(KBCatalog* catalog) } - connect(catalog,TQT_SIGNAL(signalUndoAvailable(bool)),this - ,TQT_SLOT(enableUndo(bool))); - connect(catalog,TQT_SIGNAL(signalRedoAvailable(bool)),this - ,TQT_SLOT(enableRedo(bool))); - connect(catalog,TQT_SIGNAL(signalNumberOfFuzziesChanged(uint)),this - ,TQT_SLOT(setNumberOfFuzzies(uint))); - connect(catalog,TQT_SIGNAL(signalNumberOfUntranslatedChanged(uint)),this - ,TQT_SLOT(setNumberOfUntranslated(uint))); - connect(catalog,TQT_SIGNAL(signalTotalNumberChanged(uint)),this - ,TQT_SLOT(setNumberOfTotal(uint))); - connect(catalog,TQT_SIGNAL(signalProgress(int)),_progressBar,TQT_SLOT(setProgress(int))); - connect(catalog,TQT_SIGNAL(signalClearProgressBar()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar())); - connect(catalog,TQT_SIGNAL(signalResetProgressBar(TQString,int)) - ,TQT_TQOBJECT(this),TQT_SLOT(prepareProgressBar(TQString,int))); - connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),TQT_TQOBJECT(this),TQT_SLOT(enableDefaults(bool))); - connect(catalog,TQT_SIGNAL(signalFileOpened(bool)),m_view,TQT_SLOT(newFileOpened(bool))); - connect(catalog,TQT_SIGNAL(signalModified(bool)),TQT_TQOBJECT(this),TQT_SLOT(showModified(bool))); + connect(catalog,TQ_SIGNAL(signalUndoAvailable(bool)),this + ,TQ_SLOT(enableUndo(bool))); + connect(catalog,TQ_SIGNAL(signalRedoAvailable(bool)),this + ,TQ_SLOT(enableRedo(bool))); + connect(catalog,TQ_SIGNAL(signalNumberOfFuzziesChanged(uint)),this + ,TQ_SLOT(setNumberOfFuzzies(uint))); + connect(catalog,TQ_SIGNAL(signalNumberOfUntranslatedChanged(uint)),this + ,TQ_SLOT(setNumberOfUntranslated(uint))); + connect(catalog,TQ_SIGNAL(signalTotalNumberChanged(uint)),this + ,TQ_SLOT(setNumberOfTotal(uint))); + connect(catalog,TQ_SIGNAL(signalProgress(int)),_progressBar,TQ_SLOT(setProgress(int))); + connect(catalog,TQ_SIGNAL(signalClearProgressBar()),this,TQ_SLOT(clearProgressBar())); + connect(catalog,TQ_SIGNAL(signalResetProgressBar(TQString,int)) + ,this,TQ_SLOT(prepareProgressBar(TQString,int))); + connect(catalog,TQ_SIGNAL(signalFileOpened(bool)),this,TQ_SLOT(enableDefaults(bool))); + connect(catalog,TQ_SIGNAL(signalFileOpened(bool)),m_view,TQ_SLOT(newFileOpened(bool))); + connect(catalog,TQ_SIGNAL(signalModified(bool)),this,TQ_SLOT(showModified(bool))); // allow the view to change the statusbar and caption - connect(m_view, TQT_SIGNAL(signalChangeStatusbar(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(changeStatusbar(const TQString&))); - connect(m_view, TQT_SIGNAL(signalChangeCaption(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(changeCaption(const TQString&))); - connect(m_view,TQT_SIGNAL(signalFirstDisplayed(bool, bool)),this - ,TQT_SLOT(firstEntryDisplayed(bool, bool))); - connect(m_view,TQT_SIGNAL(signalLastDisplayed(bool, bool)),this - ,TQT_SLOT(lastEntryDisplayed(bool, bool))); - connect(m_view,TQT_SIGNAL(signalFuzzyDisplayed(bool)),this - ,TQT_SLOT(fuzzyDisplayed(bool))); - connect(m_view,TQT_SIGNAL(signalUntranslatedDisplayed(bool)),this - ,TQT_SLOT(untranslatedDisplayed(bool))); - connect(m_view,TQT_SIGNAL(signalFaultyDisplayed(bool)),this - ,TQT_SLOT(faultyDisplayed(bool))); - connect(m_view,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)),this - ,TQT_SLOT(displayedEntryChanged(const KBabel::DocPosition&))); - connect(m_view,TQT_SIGNAL(signalFuzzyAfterwards(bool)),this - ,TQT_SLOT(hasFuzzyAfterwards(bool))); - connect(m_view,TQT_SIGNAL(signalFuzzyInFront(bool)),this - ,TQT_SLOT(hasFuzzyInFront(bool))); - connect(m_view,TQT_SIGNAL(signalUntranslatedAfterwards(bool)),this - ,TQT_SLOT(hasUntranslatedAfterwards(bool))); - connect(m_view,TQT_SIGNAL(signalUntranslatedInFront(bool)),this - ,TQT_SLOT(hasUntranslatedInFront(bool))); - connect(m_view,TQT_SIGNAL(signalErrorAfterwards(bool)),this - ,TQT_SLOT(hasErrorAfterwards(bool))); - connect(m_view,TQT_SIGNAL(signalErrorInFront(bool)),this - ,TQT_SLOT(hasErrorInFront(bool))); - connect(m_view,TQT_SIGNAL(signalBackHistory(bool)),this - ,TQT_SLOT(enableBackHistory(bool))); - connect(m_view,TQT_SIGNAL(signalForwardHistory(bool)),this - ,TQT_SLOT(enableForwardHistory(bool))); - - - connect(m_view,TQT_SIGNAL(ledColorChanged(const TQColor&)),this - ,TQT_SLOT(setLedColor(const TQColor&))); - - - connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),TQT_TQOBJECT(this),TQT_SLOT(enableStop(bool))); - - connect(m_view,TQT_SIGNAL(signalProgress(int)),_progressBar,TQT_SLOT(setProgress(int))); - connect(m_view,TQT_SIGNAL(signalClearProgressBar()),TQT_TQOBJECT(this),TQT_SLOT(clearProgressBar())); - connect(m_view,TQT_SIGNAL(signalResetProgressBar(TQString,int)) - ,TQT_TQOBJECT(this),TQT_SLOT(prepareProgressBar(TQString,int))); - - connect(m_view,TQT_SIGNAL(signalDictionariesChanged()) - , TQT_TQOBJECT(this), TQT_SLOT(buildDictMenus())); - connect(m_view,TQT_SIGNAL(signalCursorPosChanged(int,int)), this - , TQT_SLOT(updateCursorPosition(int,int))); + connect(m_view, TQ_SIGNAL(signalChangeStatusbar(const TQString&)), + this, TQ_SLOT(changeStatusbar(const TQString&))); + connect(m_view, TQ_SIGNAL(signalChangeCaption(const TQString&)), + this, TQ_SLOT(changeCaption(const TQString&))); + connect(m_view,TQ_SIGNAL(signalFirstDisplayed(bool, bool)),this + ,TQ_SLOT(firstEntryDisplayed(bool, bool))); + connect(m_view,TQ_SIGNAL(signalLastDisplayed(bool, bool)),this + ,TQ_SLOT(lastEntryDisplayed(bool, bool))); + connect(m_view,TQ_SIGNAL(signalFuzzyDisplayed(bool)),this + ,TQ_SLOT(fuzzyDisplayed(bool))); + connect(m_view,TQ_SIGNAL(signalUntranslatedDisplayed(bool)),this + ,TQ_SLOT(untranslatedDisplayed(bool))); + connect(m_view,TQ_SIGNAL(signalFaultyDisplayed(bool)),this + ,TQ_SLOT(faultyDisplayed(bool))); + connect(m_view,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)),this + ,TQ_SLOT(displayedEntryChanged(const KBabel::DocPosition&))); + connect(m_view,TQ_SIGNAL(signalFuzzyAfterwards(bool)),this + ,TQ_SLOT(hasFuzzyAfterwards(bool))); + connect(m_view,TQ_SIGNAL(signalFuzzyInFront(bool)),this + ,TQ_SLOT(hasFuzzyInFront(bool))); + connect(m_view,TQ_SIGNAL(signalUntranslatedAfterwards(bool)),this + ,TQ_SLOT(hasUntranslatedAfterwards(bool))); + connect(m_view,TQ_SIGNAL(signalUntranslatedInFront(bool)),this + ,TQ_SLOT(hasUntranslatedInFront(bool))); + connect(m_view,TQ_SIGNAL(signalErrorAfterwards(bool)),this + ,TQ_SLOT(hasErrorAfterwards(bool))); + connect(m_view,TQ_SIGNAL(signalErrorInFront(bool)),this + ,TQ_SLOT(hasErrorInFront(bool))); + connect(m_view,TQ_SIGNAL(signalBackHistory(bool)),this + ,TQ_SLOT(enableBackHistory(bool))); + connect(m_view,TQ_SIGNAL(signalForwardHistory(bool)),this + ,TQ_SLOT(enableForwardHistory(bool))); + + + connect(m_view,TQ_SIGNAL(ledColorChanged(const TQColor&)),this + ,TQ_SLOT(setLedColor(const TQColor&))); + + + connect(m_view,TQ_SIGNAL(signalSearchActive(bool)),this,TQ_SLOT(enableStop(bool))); + + connect(m_view,TQ_SIGNAL(signalProgress(int)),_progressBar,TQ_SLOT(setProgress(int))); + connect(m_view,TQ_SIGNAL(signalClearProgressBar()),this,TQ_SLOT(clearProgressBar())); + connect(m_view,TQ_SIGNAL(signalResetProgressBar(TQString,int)) + ,this,TQ_SLOT(prepareProgressBar(TQString,int))); + + connect(m_view,TQ_SIGNAL(signalDictionariesChanged()) + , this, TQ_SLOT(buildDictMenus())); + connect(m_view,TQ_SIGNAL(signalCursorPosChanged(int,int)), this + , TQ_SLOT(updateCursorPosition(int,int))); if(!catalog->currentURL().isEmpty()) { @@ -296,14 +296,14 @@ void KBabelMW::init(KBCatalog* catalog) // 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()), - bmHandler, TQT_SLOT(slotClearBookmarks())); + action->disconnect(TQ_SIGNAL(activated())); + connect(action, TQ_SIGNAL(activated()), + bmHandler, TQ_SLOT(slotClearBookmarks())); } - connect(bmHandler, TQT_SIGNAL(signalBookmarkSelected(int)), - TQT_TQOBJECT(this), TQT_SLOT(slotOpenBookmark(int))); - connect(m_view, TQT_SIGNAL(signalNewFileOpened(KURL)), - bmHandler, TQT_SLOT(slotClearBookmarks())); + connect(bmHandler, TQ_SIGNAL(signalBookmarkSelected(int)), + this, TQ_SLOT(slotOpenBookmark(int))); + connect(m_view, TQ_SIGNAL(signalNewFileOpened(KURL)), + bmHandler, TQ_SLOT(slotClearBookmarks())); _config = TDESharedConfig::openConfig( "kbabelrc" ); restoreSettings(); @@ -335,7 +335,7 @@ void KBabelMW::init(KBCatalog* catalog) "set to %1. You may want to change this setting " "according to the settings of your language team.").arg(encodingStr)); - TQTimer::singleShot(1,TQT_TQOBJECT(this),TQT_SLOT(projectConfigure())); + TQTimer::singleShot(1,this,TQ_SLOT(projectConfigure())); } _config->writeEntry("Version",VERSION); @@ -404,289 +404,289 @@ void KBabelMW::setupActions() TDEAction* action; // the file menu - action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); + action = KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); - a_recent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(openRecent(const KURL&)), actionCollection()); + a_recent = KStdAction::openRecent(this, TQ_SLOT(openRecent(const KURL&)), actionCollection()); a_recent->setMaxItems(MAX_RECENT); - 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 TDEAction(i18n("Save Sp&ecial..."), 0, TQT_TQOBJECT(this), TQT_SLOT(fileSaveSpecial()), + action = KStdAction::revert(m_view,TQ_SLOT(revertToSaved()),actionCollection()); + action=KStdAction::save(this, TQ_SLOT(fileSave()), actionCollection()); + action = KStdAction::saveAs(this, TQ_SLOT(fileSaveAs()), actionCollection()); + action = new TDEAction(i18n("Save Sp&ecial..."), 0, this, TQ_SLOT(fileSaveSpecial()), actionCollection(), "save_special" ); - action = new TDEAction(i18n("Set &Package..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(setFilePackage()), + action = new TDEAction(i18n("Set &Package..."), 0, m_view, TQ_SLOT(setFilePackage()), actionCollection(), "set_package" ); - action = KStdAction::mail(TQT_TQOBJECT(this), TQT_SLOT(fileMail()), actionCollection()); + action = KStdAction::mail(this, TQ_SLOT(fileMail()), actionCollection()); - action = new TDEAction(i18n("&New View"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewView()), + action = new TDEAction(i18n("&New View"), 0, this, TQ_SLOT(fileNewView()), actionCollection(), "file_new_view"); - action = new TDEAction(i18n("New &Window"), 0, TQT_TQOBJECT(this), TQT_SLOT(fileNewWindow()), + action = new TDEAction(i18n("New &Window"), 0, this, TQ_SLOT(fileNewWindow()), actionCollection(), "file_new_window"); action->setShortcut( TDEStdAccel::openNew() ); - action = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(quit()), actionCollection()); + action = KStdAction::quit(this, TQ_SLOT(quit()), actionCollection()); // the edit menu - action = KStdAction::undo(TQT_TQOBJECT(m_view), TQT_SLOT(undo()), actionCollection()); - action = KStdAction::redo(TQT_TQOBJECT(m_view), TQT_SLOT(redo()), actionCollection()); - action = KStdAction::cut(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalCut()), actionCollection()); - action = KStdAction::copy(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalCopy()), actionCollection()); - action = KStdAction::paste(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalPaste()), actionCollection()); - action = KStdAction::selectAll(TQT_TQOBJECT(m_view), TQT_SIGNAL(signalSelectAll()), actionCollection()); - action = KStdAction::find(TQT_TQOBJECT(m_view), TQT_SLOT(find()), actionCollection()); - action = KStdAction::findNext(TQT_TQOBJECT(m_view), TQT_SLOT(findNext()), actionCollection()); - action = KStdAction::findPrev(TQT_TQOBJECT(m_view), TQT_SLOT(findPrev()), actionCollection()); - action = KStdAction::replace(TQT_TQOBJECT(m_view), TQT_SLOT(replace()), actionCollection()); - - action = KStdAction::clear( TQT_TQOBJECT(m_view), TQT_SLOT(clear()), actionCollection(), "clear" ); - - action = new TDEAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, TQT_TQOBJECT(m_view) - ,TQT_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr"); + action = KStdAction::undo(m_view, TQ_SLOT(undo()), actionCollection()); + action = KStdAction::redo(m_view, TQ_SLOT(redo()), actionCollection()); + action = KStdAction::cut(m_view, TQ_SIGNAL(signalCut()), actionCollection()); + action = KStdAction::copy(m_view, TQ_SIGNAL(signalCopy()), actionCollection()); + action = KStdAction::paste(m_view, TQ_SIGNAL(signalPaste()), actionCollection()); + action = KStdAction::selectAll(m_view, TQ_SIGNAL(signalSelectAll()), actionCollection()); + action = KStdAction::find(m_view, TQ_SLOT(find()), actionCollection()); + action = KStdAction::findNext(m_view, TQ_SLOT(findNext()), actionCollection()); + action = KStdAction::findPrev(m_view, TQ_SLOT(findPrev()), actionCollection()); + action = KStdAction::replace(m_view, TQ_SLOT(replace()), actionCollection()); + + action = KStdAction::clear( m_view, TQ_SLOT(clear()), actionCollection(), "clear" ); + + action = new TDEAction(i18n("Cop&y Msgid to Msgstr"), "msgid2msgstr", CTRL+Key_Space, m_view + ,TQ_SLOT(msgid2msgstr()), actionCollection(), "msgid2msgstr"); action = new TDEAction(i18n("Copy Searc&h Result to Msgstr"), "search2msgstr", - CTRL+ALT+Key_Space, TQT_TQOBJECT(m_view), TQT_SLOT(search2msgstr()), + CTRL+ALT+Key_Space, m_view, TQ_SLOT(search2msgstr()), actionCollection(), "search2msgstr"); - action = new TDEAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, TQT_TQOBJECT(m_view) - ,TQT_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr"); - action = new TDEAction(i18n("Copy Selected Character to Msgstr"), Key_F10, TQT_TQOBJECT(m_charselectorview) - ,TQT_SLOT(emitChar()), actionCollection(), "char2msgstr"); - - 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 TDEAction(i18n("&Edit Header..."), 0, TQT_TQOBJECT(m_view), TQT_SLOT(editHeader()), + action = new TDEAction(i18n("Copy Msgstr to Other &Plurals"), Key_F11, m_view + ,TQ_SLOT(plural2msgstr()), actionCollection(), "plural2msgstr"); + action = new TDEAction(i18n("Copy Selected Character to Msgstr"), Key_F10, m_charselectorview + ,TQ_SLOT(emitChar()), actionCollection(), "char2msgstr"); + + a_unsetFuzzy = new TDEAction(i18n("To&ggle Fuzzy Status"), "togglefuzzy", CTRL+Key_U, m_view + , TQ_SLOT(removeFuzzyStatus()), actionCollection(), "edit_toggle_fuzzy"); + action = new TDEAction(i18n("&Edit Header..."), 0, m_view, TQ_SLOT(editHeader()), actionCollection(), "edit_edit_header"); action = new TDEAction(i18n("&Insert Next Tag"), "insert_tag", CTRL+ALT+Key_N - , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTag()) + , m_view, TQ_SLOT(insertNextTag()) , actionCollection(),"insert_next_tag"); - connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalNextTagAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); action = new TDEAction(i18n("Insert Next Tag From Msgid P&osition"), "insert_tag", CTRL+Key_M - , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextTagMsgid()) + , m_view, TQ_SLOT(insertNextTagMsgid()) , actionCollection(),"insert_next_tag_msgid"); - connect(m_view,TQT_SIGNAL(signalNextTagAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalNextTagAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); 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())); + connect(m_view,TQ_SIGNAL(signalTagsAvailable(bool)),actionMenu + ,TQ_SLOT(setEnabled(bool))); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(insertNextTag())); action = new TDEAction(i18n("Show Tags Menu"),CTRL+Key_Less - , TQT_TQOBJECT(m_view), TQT_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu"); + , m_view, TQ_SLOT(showTagsMenu()), actionCollection(),"show_tags_menu"); action->setEnabled(false); - connect(m_view,TQT_SIGNAL(signalTagsAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalTagsAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); action = new TDEAction(i18n("Move to Next Tag"), 0, CTRL+ALT+Key_M - , TQT_TQOBJECT(m_view), TQT_SLOT(skipToNextTag()) + , m_view, TQ_SLOT(skipToNextTag()) , actionCollection(),"move_to_next_tag"); action = new TDEAction(i18n("Move to Previous Tag"), 0, CTRL+ALT+Key_B - , TQT_TQOBJECT(m_view), TQT_SLOT(skipToPreviousTag()) + , m_view, TQ_SLOT(skipToPreviousTag()) , actionCollection(),"move_to_prev_tag"); action = new TDEAction(i18n("Insert Next Argument"), "insert_arg", CTRL+ALT+Key_G - , TQT_TQOBJECT(m_view), TQT_SLOT(insertNextArg()) + , m_view, TQ_SLOT(insertNextArg()) , actionCollection(),"insert_next_arg"); - connect(m_view,TQT_SIGNAL(signalNextArgAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalNextArgAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); 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())); + connect(m_view,TQ_SIGNAL(signalArgsAvailable(bool)),actionMenu + ,TQ_SLOT(setEnabled(bool))); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(insertNextArg())); action = new TDEAction(i18n("Show Arguments Menu"),CTRL+Key_Percent - , TQT_TQOBJECT(m_view), TQT_SLOT(showArgsMenu()), actionCollection(),"show_args_menu"); + , m_view, TQ_SLOT(showArgsMenu()), actionCollection(),"show_args_menu"); action->setEnabled(false); - connect(m_view,TQT_SIGNAL(signalArgsAvailable(bool)),action - ,TQT_SLOT(setEnabled(bool))); + connect(m_view,TQ_SIGNAL(signalArgsAvailable(bool)),action + ,TQ_SLOT(setEnabled(bool))); // next, the go-menu action = new TDEAction(i18n("&Previous"), "go-previous", - TDEStdAccel::shortcut(TDEStdAccel::Prior), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoPrev()), + TDEStdAccel::shortcut(TDEStdAccel::Prior), m_view , TQ_SLOT(gotoPrev()), actionCollection(),"go_prev_entry"); action = new TDEAction(i18n("&Next"), "go-next", - TDEStdAccel::shortcut(TDEStdAccel::Next), TQT_TQOBJECT(m_view) , TQT_SLOT(gotoNext()), + TDEStdAccel::shortcut(TDEStdAccel::Next), m_view , TQ_SLOT(gotoNext()), actionCollection(),"go_next_entry"); - action = KStdAction::goTo(TQT_TQOBJECT(m_view), TQT_SLOT(gotoEntry()), actionCollection()); + action = KStdAction::goTo(m_view, TQ_SLOT(gotoEntry()), actionCollection()); action->setShortcut( TDEStdAccel::gotoLine()); - action = KStdAction::firstPage(TQT_TQOBJECT(m_view), TQT_SLOT(gotoFirst()),actionCollection()); + action = KStdAction::firstPage(m_view, TQ_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 = KStdAction::lastPage(m_view, TQ_SLOT(gotoLast()),actionCollection()); action->setText(i18n("&Last Entry")); action->setShortcut(CTRL+ALT+Key_End); 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"); + CTRL+SHIFT+Key_Prior, m_view, + TQ_SLOT(gotoPrevFuzzyOrUntrans()),actionCollection(), "go_prev_fuzzyUntr"); 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"); + CTRL+SHIFT+Key_Next, m_view, + TQ_SLOT(gotoNextFuzzyOrUntrans()),actionCollection(), "go_next_fuzzyUntr"); a_prevFuzzy = new TDEAction(i18n("Pre&vious Fuzzy"),"prevfuzzy", - CTRL+Key_Prior, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy"); + CTRL+Key_Prior, m_view, + TQ_SLOT(gotoPrevFuzzy()),actionCollection(), "go_prev_fuzzy"); a_nextFuzzy = new TDEAction(i18n("Ne&xt Fuzzy"), "nextfuzzy", - CTRL+Key_Next, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); + CTRL+Key_Next, m_view, + TQ_SLOT(gotoNextFuzzy()),actionCollection(), "go_next_fuzzy"); a_prevUntrans = new TDEAction(i18n("Prev&ious Untranslated"), "prevuntranslated", - ALT+Key_Prior, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans"); + ALT+Key_Prior, m_view, + TQ_SLOT(gotoPrevUntranslated()),actionCollection(), "go_prev_untrans"); a_nextUntrans = new TDEAction(i18n("Nex&t Untranslated"), "nextuntranslated", - ALT+Key_Next, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); + ALT+Key_Next, m_view, + TQ_SLOT(gotoNextUntranslated()),actionCollection(), "go_next_untrans"); action = new TDEAction(i18n("Previo&us Error"), "preverror", - SHIFT+Key_Prior, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoPrevError()),actionCollection(), "go_prev_error"); + SHIFT+Key_Prior, m_view, + TQ_SLOT(gotoPrevError()),actionCollection(), "go_prev_error"); action = new TDEAction(i18n("Next Err&or"), "nexterror", - SHIFT+Key_Next, TQT_TQOBJECT(m_view), - TQT_SLOT(gotoNextError()),actionCollection(), "go_next_error"); - action = new TDEAction(i18n("&Back in History"), "back", ALT+Key_Left, TQT_TQOBJECT(m_view), - TQT_SLOT(backHistory()),actionCollection(), "go_back_history"); - action = new TDEAction(i18n("For&ward in History"), "forward", ALT+Key_Right, TQT_TQOBJECT(m_view), - TQT_SLOT(forwardHistory()),actionCollection(), "go_forward_history"); + SHIFT+Key_Next, m_view, + TQ_SLOT(gotoNextError()),actionCollection(), "go_next_error"); + action = new TDEAction(i18n("&Back in History"), "back", ALT+Key_Left, m_view, + TQ_SLOT(backHistory()),actionCollection(), "go_back_history"); + action = new TDEAction(i18n("For&ward in History"), "forward", ALT+Key_Right, m_view, + TQ_SLOT(forwardHistory()),actionCollection(), "go_forward_history"); // the search menu 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))); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(startSearch())); + dictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); + connect(dictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(startSearch(const TQString))); 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))); + connect(actionMenu,TQ_SIGNAL(activated()),m_view,TQ_SLOT(startSelectionSearch())); + selectionDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); + connect(selectionDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(startSelectionSearch(const TQString))); 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))); + editDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); + connect(editDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(editDictionary(const TQString))); 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))); + configDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); + connect(configDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(configureDictionary(const TQString))); 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) - , TQT_SLOT(aboutDictionary(const TQString))); + aboutDictMenu = new DictionaryMenu(actionMenu->popupMenu(),actionCollection(),this); + connect(aboutDictMenu,TQ_SIGNAL(activated(const TQString)), m_view + , TQ_SLOT(aboutDictionary(const TQString))); buildDictMenus(); // the project menu action = new TDEAction(i18n("&New..."), "document-new" - , TQT_TQOBJECT(this), TQT_SLOT(projectNew()),actionCollection() + , this, TQ_SLOT(projectNew()),actionCollection() ,"project_new"); action = new TDEAction(i18n("&Open..."), "document-open" - , TQT_TQOBJECT(this), TQT_SLOT(projectOpen()),actionCollection() + , this, TQ_SLOT(projectOpen()),actionCollection() ,"project_open"); action = new TDEAction(i18n("C&lose"), "window-close" - , TQT_TQOBJECT(this), TQT_SLOT(projectClose()),actionCollection() + , this, TQ_SLOT(projectClose()),actionCollection() ,"project_close"); action->setEnabled (_project->filename() != KBabel::ProjectManager::defaultProjectName() ); action = new TDEAction(i18n("&Configure..."), "configure" - , TQT_TQOBJECT(this), TQT_SLOT(projectConfigure()),actionCollection() + , this, TQ_SLOT(projectConfigure()),actionCollection() ,"project_settings"); - a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, TQT_TQOBJECT(this), TQT_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects"); + a_recentprojects = new TDERecentFilesAction(i18n("Open &Recent"), 0, this, TQ_SLOT(projectOpenRecent(const KURL&)), actionCollection(), "recent_projects"); // the tools menu action = new TDEAction(i18n("&Spell Check..."), "tools-check-spelling", CTRL+Key_I - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCommon()),actionCollection() + , m_view, TQ_SLOT(spellcheckCommon()),actionCollection() ,"spellcheck_common"); action = new TDEAction(i18n("&Check All..."), "spellcheck_all", 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAll()),actionCollection() + , m_view, TQ_SLOT(spellcheckAll()),actionCollection() ,"spellcheck_all"); action = new TDEAction(i18n("C&heck From Cursor Position..."), "spellcheck_from_cursor", 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCursor()),actionCollection() + , m_view, TQ_SLOT(spellcheckFromCursor()),actionCollection() ,"spellcheck_from_cursor"); action = new TDEAction(i18n("Ch&eck Current..."), "spellcheck_actual", 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckCurrent()),actionCollection() + , m_view, TQ_SLOT(spellcheckCurrent()),actionCollection() ,"spellcheck_current"); action = new TDEAction(i18n("Check Fro&m Current to End of File..."), 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckFromCurrent()),actionCollection() + , m_view, TQ_SLOT(spellcheckFromCurrent()),actionCollection() ,"spellcheck_from_current"); action = new TDEAction(i18n("Chec&k Selected Text..."), "spellcheck_selected", 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckMarked()),actionCollection() + , m_view, TQ_SLOT(spellcheckMarked()),actionCollection() ,"spellcheck_marked"); TDEToggleAction *toggleAction; 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))); + connect(toggleAction,TQ_SIGNAL(toggled(bool)), m_view, TQ_SLOT(toggleAutoDiff(bool))); + connect(m_view,TQ_SIGNAL(signalDiffEnabled(bool)), toggleAction + , TQ_SLOT(setChecked(bool))); toggleAction->setChecked(m_view->autoDiffEnabled()); action = new TDEAction(i18n("&Show Diff"), "diff", Key_F5 - , TQT_TQOBJECT(m_view), TQT_SLOT(diff()),actionCollection() + , m_view, TQ_SLOT(diff()),actionCollection() ,"diff_diff"); action = new TDEAction(i18n("S&how Original Text"), "contents", Key_F6 - , TQT_TQOBJECT(m_view), TQT_SLOT(diffShowOrig()),actionCollection() + , m_view, TQ_SLOT(diffShowOrig()),actionCollection() ,"diff_showOrig"); action = new TDEAction(i18n("&Open File for Diff"), "document-open" ,0 - , TQT_TQOBJECT(m_view), TQT_SLOT(openDiffFile()),actionCollection() + , m_view, TQ_SLOT(openDiffFile()),actionCollection() ,"diff_openFile"); action = new TDEAction(i18n("&Rough Translation..."), 0 - , TQT_TQOBJECT(m_view), TQT_SLOT(roughTranslation()),actionCollection() + , m_view, TQ_SLOT(roughTranslation()),actionCollection() ,"rough_translation"); - action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , TQT_TQOBJECT(this), - TQT_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager"); + action = new TDEAction(i18n("&Catalog Manager..."),"catalogmanager", 0 , this, + TQ_SLOT(openCatalogManager()),actionCollection(), "open_catalog_manager"); - new TDEAction( 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,this,TQ_SLOT(toggleEditMode()), actionCollection(), "toggle_insert_mode"); - new TDEAction( i18n("&Word Count"), 0, TQT_TQOBJECT(m_view), TQT_SLOT(wordCount()), actionCollection(), "word_count"); + new TDEAction( i18n("&Word Count"), 0, m_view, TQ_SLOT(wordCount()), actionCollection(), "word_count"); // next, the settings menu createStandardStatusBarAction(); - KStdAction::configureToolbars(TQT_TQOBJECT(this),TQT_SLOT(optionsEditToolbars()),actionCollection()); + KStdAction::configureToolbars(this,TQ_SLOT(optionsEditToolbars()),actionCollection()); - KStdAction::keyBindings(guiFactory(),TQT_SLOT(configureShortcuts()),actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this),TQT_SLOT(optionsPreferences()),actionCollection()); + KStdAction::keyBindings(guiFactory(),TQ_SLOT(configureShortcuts()),actionCollection()); + KStdAction::preferences(this,TQ_SLOT(optionsPreferences()),actionCollection()); setStandardToolBarMenuEnabled ( true ); - action = new TDEAction(i18n("&Stop Searching"), "process-stop",Key_Escape, TQT_TQOBJECT(m_view), - TQT_SLOT(stopSearch()),actionCollection(), "stop_search"); + action = new TDEAction(i18n("&Stop Searching"), "process-stop",Key_Escape, m_view, + TQ_SLOT(stopSearch()),actionCollection(), "stop_search"); action->setEnabled(false); - new TDEAction(i18n("&Gettext Info"), 0, TQT_TQOBJECT(this), - TQT_SLOT(gettextHelp()), actionCollection(), "help_gettext"); + new TDEAction(i18n("&Gettext Info"), 0, this, + TQ_SLOT(gettextHelp()), actionCollection(), "help_gettext"); // the bookmarks menu - action = KStdAction::addBookmark(TQT_TQOBJECT(this), TQT_SLOT(slotAddBookmark()), + action = KStdAction::addBookmark(this, TQ_SLOT(slotAddBookmark()), actionCollection(), "add_bookmark"); action->setEnabled(false); // this action is now connected to dummySlot(), and later reconnected // to bmHandler after that object actually is created - new TDEAction(i18n("Clear Bookmarks"), 0, TQT_TQOBJECT(this), TQT_SLOT(dummySlot()), + new TDEAction(i18n("Clear Bookmarks"), 0, this, TQ_SLOT(dummySlot()), actionCollection(), "clear_bookmarks"); setupDynamicActions(); @@ -759,20 +759,20 @@ void KBabelMW::setupDynamicActions() TQValueList<KDataToolInfo> tools = ToolAction::validationTools(); TQPtrList<TDEAction> actions = ToolAction::dataToolActionList( - tools, TQT_TQOBJECT(m_view), TQT_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )), + tools, m_view, TQ_SLOT(validateUsingTool( const KDataToolInfo &, const TQString & )), "validate", false, actionCollection() ); TDEActionMenu* m_menu = new TDEActionMenu(i18n("&Validation"), actionCollection(), "dynamic_validation_tools"); - TDEAction* ac = new TDEAction(i18n("Perform &All Checks"), CTRL+Key_E , TQT_TQOBJECT(m_view), - TQT_SLOT(checkAll()),actionCollection(), "check_all"); + TDEAction* ac = new TDEAction(i18n("Perform &All Checks"), CTRL+Key_E , m_view, + TQ_SLOT(checkAll()),actionCollection(), "check_all"); ac->setEnabled(false); m_menu->insert(ac); m_menu->insert( new TDEActionSeparator() ); - ac = new TDEAction(i18n("C&heck Syntax"), CTRL+Key_T , TQT_TQOBJECT(m_view), - TQT_SLOT(checkSyntax()),actionCollection(), "check_syntax"); + ac = new TDEAction(i18n("C&heck Syntax"), CTRL+Key_T , m_view, + TQ_SLOT(checkSyntax()),actionCollection(), "check_syntax"); ac->setEnabled(false); m_menu->insert(ac); @@ -801,7 +801,7 @@ void KBabelMW::setupDynamicActions() // create corresponding actions actions = ToolAction::dataToolActionList( - modifyTools, TQT_TQOBJECT(m_view), TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, m_view, TQ_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), "validate", true, actionCollection() ); // skip validation actions @@ -833,7 +833,7 @@ void KBabelMW::setupDynamicActions() // create corresponding actions actions = ToolAction::dataToolActionList( - modifyTools, TQT_TQOBJECT(m_view), TQT_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, m_view, TQ_SLOT(modifyUsingTool( const KDataToolInfo &, const TQString & )), "validate", true, actionCollection() ); // skip validation actions @@ -844,7 +844,7 @@ void KBabelMW::setupDynamicActions() // create corresponding actions actions = ToolAction::dataToolActionList( - modifyTools, TQT_TQOBJECT(m_view), TQT_SLOT(modifyCatalogUsingTool( const KDataToolInfo &, const TQString & )), + modifyTools, m_view, TQ_SLOT(modifyCatalogUsingTool( const KDataToolInfo &, const TQString & )), "validate", true, actionCollection() ); // insert tools @@ -923,7 +923,7 @@ bool KBabelMW::queryClose() { if(m_view->isSearching()) { - connect(m_view,TQT_SIGNAL(signalSearchActive(bool)),TQT_TQOBJECT(this),TQT_SLOT(quit())); + connect(m_view,TQ_SIGNAL(signalSearchActive(bool)),this,TQ_SLOT(quit())); m_view->stopSearch(); return false; } @@ -932,7 +932,7 @@ bool KBabelMW::queryClose() { // stop the activity and try again m_view->catalog()->stop(); - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT( close() )); + TQTimer::singleShot(0, this, TQ_SLOT( close() )); return false; } @@ -1067,7 +1067,7 @@ void KBabelMW::addToRecentFiles(KURL url) void KBabelMW::fileSave() { // do it asynchronously due to tdelibs bug - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT( fileSave_internal() )); + TQTimer::singleShot( 0, this, TQ_SLOT( fileSave_internal() )); } void KBabelMW::fileSave_internal() @@ -1090,7 +1090,7 @@ void KBabelMW::fileSave_internal() KURL url=m_view->currentURL(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << ((url.directory(false)+url.fileName()).utf8()) ; @@ -1107,7 +1107,7 @@ void KBabelMW::fileSaveAs() m_view->saveFileAs(); KURL url=m_view->currentURL(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << ((url.directory(false)+url.fileName()).utf8()) ; @@ -1121,7 +1121,7 @@ void KBabelMW::fileSaveSpecial() KURL url=m_view->currentURL(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data; TQDataStream arg(data, IO_WriteOnly); arg << ((url.directory(false)+url.fileName()).utf8()) ; @@ -1181,7 +1181,7 @@ void KBabelMW::optionsEditToolbars() { saveMainWindowSettings( TDEGlobal::config(), "View" ); KEditToolbar dlg(actionCollection()); - connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_TQOBJECT(this), TQT_SLOT(newToolbarConfig())); + connect(&dlg, TQ_SIGNAL(newToolbarConfig()), this, TQ_SLOT(newToolbarConfig())); dlg.exec(); } @@ -1198,8 +1198,8 @@ void KBabelMW::optionsPreferences() _prefDialog = new KBabelPreferences(m_view->dictionaries()); prefDialogs.append(_prefDialog); - connect(_prefDialog,TQT_SIGNAL(settingsChanged()) - ,m_view,TQT_SLOT(updateSettings())); + connect(_prefDialog,TQ_SIGNAL(settingsChanged()) + ,m_view,TQ_SLOT(updateSettings())); } int prefHeight=_prefDialog->height(); @@ -1242,7 +1242,7 @@ void KBabelMW::openCatalogManager() TQCString service; TQString result; - DCOPClient * client = kapp->dcopClient(); + DCOPClient * client = tdeApp->dcopClient(); // find out, if there is a running catalog manager QCStringList apps = client->registeredApplications(); @@ -1261,7 +1261,7 @@ void KBabelMW::openCatalogManager() { TQString prog = "catalogmanager"; TQString url = ""; - if( kapp->startServiceByDesktopName(prog,url, &result,&service)) + if( tdeApp->startServiceByDesktopName(prog,url, &result,&service)) { KMessageBox::error(this, i18n("Unable to use TDELauncher to start " "Catalog Manager. You should check the installation of TDE.\n" @@ -1621,7 +1621,7 @@ KBabelMW *KBabelMW::winForURL(const KURL& url, TQString project) } if(p) - kb = static_cast<KBabelMW*>(TQT_TQWIDGET(p)); + kb = static_cast<KBabelMW*>(p); } return kb; @@ -1641,7 +1641,7 @@ KBabelMW *KBabelMW::emptyWin(TQString project) } if(p) - kb = static_cast<KBabelMW*>(TQT_TQWIDGET(p)); + kb = static_cast<KBabelMW*>(p); } return kb; @@ -1651,7 +1651,7 @@ void KBabelMW::spellcheckMoreFiles(TQStringList filelist) { if( filelist.isEmpty() ) return; _toSpellcheck = filelist; - connect( m_view, TQT_SIGNAL( signalSpellcheckDone(int) ), TQT_TQOBJECT(this), TQT_SLOT( spellcheckDone(int))); + connect( m_view, TQ_SIGNAL( signalSpellcheckDone(int) ), this, TQ_SLOT( spellcheckDone(int))); spellcheckDone( KS_IGNORE ); // use something else than KS_STOP } @@ -1659,7 +1659,7 @@ void KBabelMW::spellcheckDone( int result) { if( _toSpellcheck.isEmpty() || result == KS_STOP) { - disconnect( m_view, TQT_SIGNAL( signalSpellcheckDone(int)), TQT_TQOBJECT(this), TQT_SLOT(spellcheckDone( int))); + disconnect( m_view, TQ_SIGNAL( signalSpellcheckDone(int)), this, TQ_SLOT(spellcheckDone( int))); KMessageBox::information( this, i18n("MessageBox text", "Spellchecking of multiple files is finished."), i18n("MessageBox caption", "Spellcheck Done")); } @@ -1670,7 +1670,7 @@ void KBabelMW::spellcheckDone( int result) if( m_view->isModified() ) fileSave(); open(KURL( file ), TQString(), false); kdDebug(KBABEL) << "Starting another spellcheck" << endl; - TQTimer::singleShot( 1, TQT_TQOBJECT(m_view), TQT_SLOT(spellcheckAllMulti())); + TQTimer::singleShot( 1, m_view, TQ_SLOT(spellcheckAllMulti())); } } @@ -1792,8 +1792,8 @@ void KBabelMW::projectConfigure() if(!_projectDialog) { _projectDialog = new ProjectDialog(_project); - connect (_projectDialog, TQT_SIGNAL (settingsChanged()) - , TQT_TQOBJECT(m_view), TQT_SLOT (updateProjectSettings())); + connect (_projectDialog, TQ_SIGNAL (settingsChanged()) + , m_view, TQ_SLOT (updateProjectSettings())); } int prefHeight=_projectDialog->height(); diff --git a/kbabel/kbabel/kbabelpref.cpp b/kbabel/kbabel/kbabelpref.cpp index 11c0b8ee..626b5ae7 100644 --- a/kbabel/kbabel/kbabelpref.cpp +++ b/kbabel/kbabel/kbabelpref.cpp @@ -61,10 +61,10 @@ KBabelPreferences::KBabelPreferences(TQPtrList<ModuleInfo> ml) // this contains a custom widget for tool selection, set it up TQValueList<KDataToolInfo> tools = ToolAction::validationTools(); _editorPage->_kcfg_AutoCheckTools->loadTools( "validate", tools ); - connect( _editorPage->_kcfg_AutoCheckTools, TQT_SIGNAL( added( TQListBoxItem * ) ), - this, TQT_SLOT (updateButtons())); - connect( _editorPage->_kcfg_AutoCheckTools, TQT_SIGNAL( removed( TQListBoxItem * ) ), - this, TQT_SLOT (updateButtons())); + connect( _editorPage->_kcfg_AutoCheckTools, TQ_SIGNAL( added( TQListBoxItem * ) ), + this, TQ_SLOT (updateButtons())); + connect( _editorPage->_kcfg_AutoCheckTools, TQ_SIGNAL( removed( TQListBoxItem * ) ), + this, TQ_SLOT (updateButtons())); addPage(_searchPage = new SearchPreferences(0, "search") , i18n("title of page in preferences dialog","Search") @@ -78,8 +78,8 @@ KBabelPreferences::KBabelPreferences(TQPtrList<ModuleInfo> ml) _searchPage->_kcfg_DefaultModule->insertItem(info->name); } moduleList = ml; - connect( _searchPage->_kcfg_DefaultModule, TQT_SIGNAL( activated(int) ), - this, TQT_SLOT (updateButtons())); + connect( _searchPage->_kcfg_DefaultModule, TQ_SIGNAL( activated(int) ), + this, TQ_SLOT (updateButtons())); addPage(new EditorDiffPreferences(0, "diff") ,i18n("title of page in preferences dialog","Diff") @@ -103,7 +103,7 @@ KBabelPreferences::KBabelPreferences(TQPtrList<ModuleInfo> ml) void KBabelPreferences::slotHelp() { //TODO - kapp->invokeHelp("Preferences",""); + tdeApp->invokeHelp("Preferences",""); } bool KBabelPreferences::hasChanged() diff --git a/kbabel/kbabel/kbabelsplash.cpp b/kbabel/kbabel/kbabelsplash.cpp index 848d506f..c3526960 100644 --- a/kbabel/kbabel/kbabelsplash.cpp +++ b/kbabel/kbabel/kbabelsplash.cpp @@ -36,7 +36,7 @@ #include <tqfontmetrics.h> #include <tqpainter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> KBabelSplash* KBabelSplash::instance = 0; diff --git a/kbabel/kbabel/kbabelview.cpp b/kbabel/kbabel/kbabelview.cpp index a96c5a72..adb07ac7 100644 --- a/kbabel/kbabel/kbabelview.cpp +++ b/kbabel/kbabel/kbabelview.cpp @@ -201,57 +201,57 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project msgstrEdit->setReadOnly(true); dictBox->setEnabled(false); - connect(this, TQT_SIGNAL(signalNewFileOpened(KURL)), - m_cataloglistview, TQT_SLOT(slotNewFileOpened())); + connect(this, TQ_SIGNAL(signalNewFileOpened(KURL)), + m_cataloglistview, TQ_SLOT(slotNewFileOpened())); - connect(msgstrEdit,TQT_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQT_SLOT(forwardMsgstrEditCmd(KBabel::EditCommand*))); - connect(msgstrEdit,TQT_SIGNAL(textChanged()),this - ,TQT_SIGNAL(signalMsgstrChanged())); + connect(msgstrEdit,TQ_SIGNAL(signalUndoCmd(KBabel::EditCommand*)),this,TQ_SLOT(forwardMsgstrEditCmd(KBabel::EditCommand*))); + connect(msgstrEdit,TQ_SIGNAL(textChanged()),this + ,TQ_SIGNAL(signalMsgstrChanged())); - connect(msgstrEdit,TQT_SIGNAL(textChanged(const TQString&)),m_cataloglistview - ,TQT_SLOT(msgstrChanged(const TQString&))); + connect(msgstrEdit,TQ_SIGNAL(textChanged(const TQString&)),m_cataloglistview + ,TQ_SLOT(msgstrChanged(const TQString&))); - connect(this,TQT_SIGNAL(signalMsgstrChanged()),this,TQT_SLOT(autoCheck())); - connect(msgstrEdit,TQT_SIGNAL(currentFormChanged(uint)), this - ,TQT_SLOT(msgstrPluralFormChanged(uint))); - - connect(msgidLabel,TQT_SIGNAL(cursorPositionChanged(int,int)) - , this, TQT_SIGNAL(signalCursorPosChanged(int,int))); - connect(msgstrEdit,TQT_SIGNAL(cursorPositionChanged(int,int)) - , this, TQT_SIGNAL(signalCursorPosChanged(int,int))); - - connect(dictBox,TQT_SIGNAL(searchStarted()),this - ,TQT_SLOT(forwardSearchStart())); - connect(dictBox, TQT_SIGNAL(progressStarts(const TQString&)), this - ,TQT_SLOT(forwardProgressStart(const TQString&))); - connect(dictBox,TQT_SIGNAL(progressed(int)),this - ,TQT_SIGNAL(signalProgress(int))); - connect(dictBox,TQT_SIGNAL(searchStopped()),this - ,TQT_SLOT(forwardSearchStop())); - connect(dictBox,TQT_SIGNAL(progressEnds()),this - ,TQT_SIGNAL(signalClearProgressBar())); - - connect(dictBox,TQT_SIGNAL(modulesChanged()),this, - TQT_SIGNAL(signalDictionariesChanged())); - connect(dictBox,TQT_SIGNAL(errorInModule(const TQString&)),this - ,TQT_SLOT(showError(const TQString&))); - - connect(_catalog,TQT_SIGNAL(signalSettingsChanged(KBabel::IdentitySettings)), - this, TQT_SLOT(setNewLanguage())); - - connect(_catalog,TQT_SIGNAL(signalNumberOfFuzziesChanged(uint)), - this, TQT_SLOT(checkFuzzies())); - connect(_catalog,TQT_SIGNAL(signalNumberOfUntranslatedChanged(uint)), - this, TQT_SLOT(checkUntranslated())); + connect(this,TQ_SIGNAL(signalMsgstrChanged()),this,TQ_SLOT(autoCheck())); + connect(msgstrEdit,TQ_SIGNAL(currentFormChanged(uint)), this + ,TQ_SLOT(msgstrPluralFormChanged(uint))); + + connect(msgidLabel,TQ_SIGNAL(cursorPositionChanged(int,int)) + , this, TQ_SIGNAL(signalCursorPosChanged(int,int))); + connect(msgstrEdit,TQ_SIGNAL(cursorPositionChanged(int,int)) + , this, TQ_SIGNAL(signalCursorPosChanged(int,int))); + + connect(dictBox,TQ_SIGNAL(searchStarted()),this + ,TQ_SLOT(forwardSearchStart())); + connect(dictBox, TQ_SIGNAL(progressStarts(const TQString&)), this + ,TQ_SLOT(forwardProgressStart(const TQString&))); + connect(dictBox,TQ_SIGNAL(progressed(int)),this + ,TQ_SIGNAL(signalProgress(int))); + connect(dictBox,TQ_SIGNAL(searchStopped()),this + ,TQ_SLOT(forwardSearchStop())); + connect(dictBox,TQ_SIGNAL(progressEnds()),this + ,TQ_SIGNAL(signalClearProgressBar())); + + connect(dictBox,TQ_SIGNAL(modulesChanged()),this, + TQ_SIGNAL(signalDictionariesChanged())); + connect(dictBox,TQ_SIGNAL(errorInModule(const TQString&)),this + ,TQ_SLOT(showError(const TQString&))); + + connect(_catalog,TQ_SIGNAL(signalSettingsChanged(KBabel::IdentitySettings)), + this, TQ_SLOT(setNewLanguage())); + + connect(_catalog,TQ_SIGNAL(signalNumberOfFuzziesChanged(uint)), + this, TQ_SLOT(checkFuzzies())); + connect(_catalog,TQ_SIGNAL(signalNumberOfUntranslatedChanged(uint)), + this, TQ_SLOT(checkUntranslated())); if(buildLeds) { - connect(this,TQT_SIGNAL(signalFuzzyDisplayed(bool)) - ,this,TQT_SLOT(toggleFuzzyLed(bool))); - connect(this,TQT_SIGNAL(signalUntranslatedDisplayed(bool)) - ,this,TQT_SLOT(toggleUntransLed(bool))); - connect(this,TQT_SIGNAL(signalFaultyDisplayed(bool)) - ,this,TQT_SLOT(toggleErrorLed(bool))); + connect(this,TQ_SIGNAL(signalFuzzyDisplayed(bool)) + ,this,TQ_SLOT(toggleFuzzyLed(bool))); + connect(this,TQ_SIGNAL(signalUntranslatedDisplayed(bool)) + ,this,TQ_SLOT(toggleUntransLed(bool))); + connect(this,TQ_SIGNAL(signalFaultyDisplayed(bool)) + ,this,TQ_SLOT(toggleErrorLed(bool))); } _dropMenu = new TQPopupMenu(this); @@ -261,8 +261,8 @@ KBabelView::KBabelView(KBCatalog* catalog,KBabelMW *parent, Project::Ptr project readSettings(_config); readProject(_project); - connect (project, TQT_SIGNAL(signalSpellcheckSettingsChanged()), - this, TQT_SLOT(updateProjectSettings())); + connect (project, TQ_SIGNAL(signalSpellcheckSettingsChanged()), + this, TQ_SLOT(updateProjectSettings())); if(!_catalog->currentURL().isEmpty()) { @@ -356,10 +356,10 @@ of the currently displayed entry.</p></qt>")); m_mainwindow->setMainDockWidget(mainDock); // master dockwidget mainDock->show (); m_mainwindow->setView (mainDock); - connect (this, TQT_SIGNAL (signalCopy ()), this, TQT_SLOT (textCopy ())); - connect (this, TQT_SIGNAL (signalCut ()), this, TQT_SLOT (textCut ())); - connect (this, TQT_SIGNAL (signalPaste ()), this, TQT_SLOT (textPaste ())); - connect (this, TQT_SIGNAL (signalSelectAll ()), this, TQT_SLOT (selectAll ())); + connect (this, TQ_SIGNAL (signalCopy ()), this, TQ_SLOT (textCopy ())); + connect (this, TQ_SIGNAL (signalCut ()), this, TQ_SLOT (textCut ())); + connect (this, TQ_SIGNAL (signalPaste ()), this, TQ_SLOT (textPaste ())); + connect (this, TQ_SIGNAL (signalSelectAll ()), this, TQ_SLOT (selectAll ())); KDockWidget* comment_dock = m_mainwindow->createDockWidget( "Comment", TQPixmap ()); //i18n: translators: Dock window caption @@ -372,11 +372,11 @@ of the currently displayed entry.</p></qt>")); KDockWidget::DockRight, // dock site 20 ); // relation target/this (in percent) comment_dock->show (); - connect (this, TQT_SIGNAL (signalCopy ()), m_commentview, TQT_SLOT (textCopy ())); - connect (this, TQT_SIGNAL (signalCut ()), m_commentview, TQT_SLOT (textCut ())); - connect (this, TQT_SIGNAL (signalPaste ()), m_commentview, TQT_SLOT (textPaste ())); - connect (this, TQT_SIGNAL (signalSelectAll ()), m_commentview, TQT_SLOT (textSelectAll ())); - m_commentview->installEventFilter( TQT_TQOBJECT(this) ); + connect (this, TQ_SIGNAL (signalCopy ()), m_commentview, TQ_SLOT (textCopy ())); + connect (this, TQ_SIGNAL (signalCut ()), m_commentview, TQ_SLOT (textCut ())); + connect (this, TQ_SIGNAL (signalPaste ()), m_commentview, TQ_SLOT (textPaste ())); + connect (this, TQ_SIGNAL (signalSelectAll ()), m_commentview, TQ_SLOT (textSelectAll ())); + m_commentview->installEventFilter( this ); // build the msgstr widget tempWidget=new TQWidget(this,"msgstrWidget"); @@ -550,30 +550,30 @@ of the currently displayed entry.</p></qt>")); 20 ); dock->show (); - connect(m_cataloglistview,TQT_SIGNAL(signalSelectionChanged(const KBabel::DocPosition&)) - ,this,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_commentview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_contextview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_taglistview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_sourceview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) - ,m_errorlistview,TQT_SLOT(gotoEntry(const KBabel::DocPosition&))); - connect(this,TQT_SIGNAL(signalFaultyDisplayed(bool)) - ,m_errorlistview,TQT_SLOT(updateView())); - connect(m_charselectorview, TQT_SIGNAL( characterDoubleClicked(TQChar) ) - ,this, TQT_SLOT( insertChar(TQChar) )); - connect(m_taglistview,TQT_SIGNAL(signalTagSelected(const TQString&)) - , this, TQT_SLOT(insertTagFromTool(const TQString&))); - connect(m_taglistview,TQT_SIGNAL(signalHighlightedTagChanged(int)) - , this, TQT_SLOT(skipToTagFromTool(int))); - connect(this, TQT_SIGNAL(signalNextTag(int)) - , m_taglistview, TQT_SLOT(highlightTag(int))); - connect(m_commentview,TQT_SIGNAL(signalCursorPosChanged(int,int)) - , m_mainwindow, TQT_SLOT(updateCursorPosition(int,int))); + connect(m_cataloglistview,TQ_SIGNAL(signalSelectionChanged(const KBabel::DocPosition&)) + ,this,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_commentview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_contextview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_taglistview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_sourceview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalDisplayed(const KBabel::DocPosition&)) + ,m_errorlistview,TQ_SLOT(gotoEntry(const KBabel::DocPosition&))); + connect(this,TQ_SIGNAL(signalFaultyDisplayed(bool)) + ,m_errorlistview,TQ_SLOT(updateView())); + connect(m_charselectorview, TQ_SIGNAL( characterDoubleClicked(TQChar) ) + ,this, TQ_SLOT( insertChar(TQChar) )); + connect(m_taglistview,TQ_SIGNAL(signalTagSelected(const TQString&)) + , this, TQ_SLOT(insertTagFromTool(const TQString&))); + connect(m_taglistview,TQ_SIGNAL(signalHighlightedTagChanged(int)) + , this, TQ_SLOT(skipToTagFromTool(int))); + connect(this, TQ_SIGNAL(signalNextTag(int)) + , m_taglistview, TQ_SLOT(highlightTag(int))); + connect(m_commentview,TQ_SIGNAL(signalCursorPosChanged(int,int)) + , m_mainwindow, TQ_SLOT(updateCursorPosition(int,int))); } KBabelView *KBabelView::viewForURL(const KURL& url, const TQString project) @@ -684,8 +684,8 @@ void KBabelView::readSettings(TDEConfig* config) if(KBabelSettings::autoUnsetFuzzy()) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQ_SIGNAL(textChanged()) + ,this,TQ_SLOT(autoRemoveFuzzyStatus())); } setupAutoCheckTools(); @@ -770,7 +770,7 @@ void KBabelView::readProject(Project::Ptr project) spell2.config->setEncoding(_spellcheckSettings.spellEncoding); spell2.config->setDictionary(_spellcheckSettings.spellDict); - spell2.tdespell= new KSpell(this, "", TQT_TQOBJECT(this), TQT_SLOT(dummy(KSpell *)), + spell2.tdespell= new KSpell(this, "", this, TQ_SLOT(dummy(KSpell *)), spell2.config, false, false); if(spell2.tdespell->status() == KSpell::Error) kdWarning(KBABEL) << "Something's wrong with KSpell, can't start on-the-fly checking" << endl; @@ -853,13 +853,13 @@ void KBabelView::updateSettings() _errorLed->setColor(KBabelSettings::ledColor()); } - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQ_SIGNAL(textChanged()) + ,this,TQ_SLOT(autoRemoveFuzzyStatus())); if(KBabelSettings::autoUnsetFuzzy()) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()) - ,this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQ_SIGNAL(textChanged()) + ,this,TQ_SLOT(autoRemoveFuzzyStatus())); } msgstrEdit->setCleverEditing(KBabelSettings::cleverEditing()); @@ -1244,7 +1244,7 @@ void KBabelView::open(const KURL& _url, const TQString & package, bool checkIfMo if ( _autoSaveDelay ) { if ( !autoSaveTimer ) { autoSaveTimer = new TQTimer( this, "AUTOSAVE TIMER" ); - connect( autoSaveTimer, TQT_SIGNAL( timeout( ) ), this, TQT_SLOT( slotAutoSaveTimeout( ) ) ); + connect( autoSaveTimer, TQ_SIGNAL( timeout( ) ), this, TQ_SLOT( slotAutoSaveTimeout( ) ) ); } autoSaveTimer->stop( ); autoSaveTimer->start( 1000 * 60 * _autoSaveDelay ); @@ -1831,7 +1831,7 @@ void KBabelView::updateEditor(int form, bool delay) if(KBabelSettings::autoUnsetFuzzy() && !msgstrEdit->isModified()) { - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(autoRemoveFuzzyStatus())); } msgidLabel->setText(_catalog->msgid(_currentIndex), _catalog->msgctxt(_currentIndex)); @@ -1844,7 +1844,7 @@ void KBabelView::updateEditor(int form, bool delay) if(KBabelSettings::autoUnsetFuzzy() && _catalog->isFuzzy(_currentIndex)) { - connect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + connect(msgstrEdit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(autoRemoveFuzzyStatus())); } msgstrEdit->blockSignals(false); @@ -1862,7 +1862,7 @@ void KBabelView::updateEditor(int form, bool delay) { if (delay) { - TQTimer::singleShot(0, this, TQT_SLOT (startSearch())); + TQTimer::singleShot(0, this, TQ_SLOT (startSearch())); } else { @@ -2083,7 +2083,7 @@ bool KBabelView::findNext_internal(DocPosition& pos, bool forReplace, bool gui) } if( isModified() && !opts.askForSave ) saveFile(); - DCOPClient *client = kapp->dcopClient(); + DCOPClient *client = tdeApp->dcopClient(); TQByteArray data, replyData; TQCString replyType; bool morefiles = false; // more files to lookup in @@ -2518,9 +2518,9 @@ void KBabelView::replace() if(success) { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); - connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); - connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); + connect(_replaceAskDialog,TQ_SIGNAL(replace()),this,TQ_SLOT(replaceNext())); + connect(_replaceAskDialog,TQ_SIGNAL(next()),this,TQ_SLOT(findNextReplace())); + connect(_replaceAskDialog,TQ_SIGNAL(replaceAll()),this,TQ_SLOT(replaceAll())); } if(opts.ask) { @@ -2615,7 +2615,7 @@ void KBabelView::replaceAll() while(success) { - kapp->processEvents(100); + tdeApp->processEvents(100); _replacesTotal++; @@ -2749,9 +2749,9 @@ void KBabelView::replaceInFile(TQCString fileSource, KBabel::ReplaceOptions opti else { if(!_replaceAskDialog) { _replaceAskDialog = new ReplaceDialog(this); - connect(_replaceAskDialog,TQT_SIGNAL(replace()),this,TQT_SLOT(replaceNext())); - connect(_replaceAskDialog,TQT_SIGNAL(next()),this,TQT_SLOT(findNextReplace())); - connect(_replaceAskDialog,TQT_SIGNAL(replaceAll()),this,TQT_SLOT(replaceAll())); + connect(_replaceAskDialog,TQ_SIGNAL(replace()),this,TQ_SLOT(replaceNext())); + connect(_replaceAskDialog,TQ_SIGNAL(next()),this,TQ_SLOT(findNextReplace())); + connect(_replaceAskDialog,TQ_SIGNAL(replaceAll()),this,TQ_SLOT(replaceAll())); } if(options.ask) { @@ -3335,7 +3335,7 @@ void KBabelView::checkUntranslated() void KBabelView::autoRemoveFuzzyStatus() { // only at first text change remove fuzzy status - disconnect(msgstrEdit,TQT_SIGNAL(textChanged()),this,TQT_SLOT(autoRemoveFuzzyStatus())); + disconnect(msgstrEdit,TQ_SIGNAL(textChanged()),this,TQ_SLOT(autoRemoveFuzzyStatus())); //removeFuzzyStatus(); } @@ -3888,7 +3888,7 @@ void KBabelView::spellcheck() if(emitProgress) { emit signalResetProgressBar(i18n("Preparing spell check"),100); - kapp->processEvents(100); + tdeApp->processEvents(100); } uint total=last-first+1; @@ -3900,7 +3900,7 @@ void KBabelView::spellcheck() lastPercent++; emit signalProgress(lastPercent); - kapp->processEvents(100); + tdeApp->processEvents(100); } TQStringList msgs=_catalog->msgstr(i); @@ -3943,7 +3943,7 @@ void KBabelView::spellcheck() _dontBeep=true; spell.tdespell= new KSpell (this, i18n("Spellcheck"), - TQT_TQOBJECT(this), TQT_SLOT(spellStart(KSpell *)), spell.config, true, true); + this, TQ_SLOT(spellStart(KSpell *)), spell.config, true, true); if( spell.tdespell->status() == KSpell::Error ) { KMessageBox::error( this, i18n("KBabel cannot start spell checker. " @@ -3951,20 +3951,20 @@ void KBabelView::spellcheck() return; } - connect(spell.tdespell, TQT_SIGNAL(death()),this, TQT_SLOT(spellCleanDone())); + connect(spell.tdespell, TQ_SIGNAL(death()),this, TQ_SLOT(spellCleanDone())); - connect(spell.tdespell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList & + connect(spell.tdespell, TQ_SIGNAL(misspelling(const TQString &, const TQStringList & , unsigned int)), this - , TQT_SLOT(spellMisspelled(const TQString &, const TQStringList &, unsigned int))); + , TQ_SLOT(spellMisspelled(const TQString &, const TQStringList &, unsigned int))); - connect(spell.tdespell, TQT_SIGNAL(corrected(const TQString &, const TQString &, unsigned int)) - , this, TQT_SLOT(spellCorrected(const TQString &, const TQString &, unsigned int))); + connect(spell.tdespell, TQ_SIGNAL(corrected(const TQString &, const TQString &, unsigned int)) + , this, TQ_SLOT(spellCorrected(const TQString &, const TQString &, unsigned int))); - connect(spell.tdespell,TQT_SIGNAL(ignoreall(const TQString &)) - , this, TQT_SLOT(spellAddIgnore(const TQString &))); + connect(spell.tdespell,TQ_SIGNAL(ignoreall(const TQString &)) + , this, TQ_SLOT(spellAddIgnore(const TQString &))); - connect(spell.tdespell, TQT_SIGNAL(done(bool)) - , this, TQT_SLOT(spellResult(bool))); + connect(spell.tdespell, TQ_SIGNAL(done(bool)) + , this, TQ_SLOT(spellResult(bool))); spell.tdespell->setAutoDelete(true); // let KSpell handle delete } @@ -4018,7 +4018,7 @@ void KBabelView::spellStart(KSpell *) if(spell.ignoreList.count() > 0) { emit signalResetProgressBar(i18n("Preparing spell check"),100); - kapp->processEvents(100); + tdeApp->processEvents(100); uint total = spell.ignoreList.count(); uint oldPercent=0; @@ -4031,7 +4031,7 @@ void KBabelView::spellStart(KSpell *) { oldPercent++; emit signalProgress(oldPercent); - kapp->processEvents(100); + tdeApp->processEvents(100); } spell.tdespell->ignore(*it); @@ -4368,7 +4368,7 @@ void KBabelView::spellResult(bool flag) spell.tdespell->cleanUp(); emit signalSpellcheckDone(s); - TQTimer::singleShot(0,this,TQT_SLOT(cleanUpSpellStruct())); + TQTimer::singleShot(0,this,TQ_SLOT(cleanUpSpellStruct())); } @@ -4458,16 +4458,16 @@ void KBabelView::slotAutoSaveTimeout( ) void KBabelView::useProject (Project::Ptr project) { // FIXME: close the current project first - disconnect (_project, TQT_SIGNAL(signalSpellcheckSettingsChanged()), - this, TQT_SLOT(updateProjectSettings())); + disconnect (_project, TQ_SIGNAL(signalSpellcheckSettingsChanged()), + this, TQ_SLOT(updateProjectSettings())); _project = project; _catalog->useProject(_project); readProject(_project); - connect (project, TQT_SIGNAL(signalSpellcheckSettingsChanged()), - this, TQT_SLOT(updateProjectSettings())); + connect (project, TQ_SIGNAL(signalSpellcheckSettingsChanged()), + this, TQ_SLOT(updateProjectSettings())); } #include "kbabelview.moc" diff --git a/kbabel/kbabel/kbabelview2.cpp b/kbabel/kbabel/kbabelview2.cpp index 5089f563..cacc1290 100644 --- a/kbabel/kbabel/kbabelview2.cpp +++ b/kbabel/kbabel/kbabelview2.cpp @@ -273,7 +273,7 @@ void KBabelView::setTagsMenu(TQPopupMenu *menu) { _tagsMenu=menu; - connect(_tagsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(insertTag(int))); + connect(_tagsMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(insertTag(int))); } void KBabelView::modifyMsgstrText(const uint offset, const TQString& text, bool clearFirst) @@ -407,7 +407,7 @@ void KBabelView::setArgsMenu(TQPopupMenu *menu) { _argsMenu=menu; - connect(_argsMenu,TQT_SIGNAL(activated(int)),this,TQT_SLOT(insertArg(int))); + connect(_argsMenu,TQ_SIGNAL(activated(int)),this,TQ_SLOT(insertArg(int))); } @@ -706,7 +706,7 @@ bool KBabelView::openDiffFile(bool autoDiff) Catalog cat; - connect(&cat,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(signalProgress(int))); + connect(&cat,TQ_SIGNAL(signalProgress(int)),this,TQ_SIGNAL(signalProgress(int))); emit signalResetProgressBar(i18n("loading file for diff"),100); ConversionStatus stat = cat.openURL(url); diff --git a/kbabel/kbabel/kbbookmarkhandler.cpp b/kbabel/kbabel/kbbookmarkhandler.cpp index 488a4281..2f128fc8 100644 --- a/kbabel/kbabel/kbbookmarkhandler.cpp +++ b/kbabel/kbabel/kbbookmarkhandler.cpp @@ -95,7 +95,7 @@ void KBabelBookmarkHandler::addBookmark(KBabelBookmark* b) // if it's okay then add the bookmark _list.append(b); _menu->insertItem(TQString("#%1 - %2").arg(b->msgindex()).arg(b->msgtext()), - this, TQT_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex()); + this, TQ_SIGNAL(signalBookmarkSelected(int)), 0, b->msgindex()); } void KBabelBookmarkHandler::addBookmark(int msgindex, TQString msgtext) diff --git a/kbabel/kbabel/kbcataloglistview.cpp b/kbabel/kbabel/kbcataloglistview.cpp index 40822862..fea743b7 100644 --- a/kbabel/kbabel/kbcataloglistview.cpp +++ b/kbabel/kbabel/kbcataloglistview.cpp @@ -52,7 +52,7 @@ KBCatalogListView::KBCatalogListView(KBCatalog* catalog, TQWidget *parent, KBabe layout->addWidget(m_listview); layout->setStretchFactor(m_listview,1); - connect(m_listview,TQT_SIGNAL(selectionChanged(TQListViewItem *)), this,TQT_SLOT(selectionChanged(TQListViewItem *))); + connect(m_listview,TQ_SIGNAL(selectionChanged(TQListViewItem *)), this,TQ_SLOT(selectionChanged(TQListViewItem *))); } KBCatalogListView::~KBCatalogListView() diff --git a/kbabel/kbabel/kbcataloglistviewitem.cpp b/kbabel/kbabel/kbcataloglistviewitem.cpp index 5507e9db..361b967c 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.cpp +++ b/kbabel/kbabel/kbcataloglistviewitem.cpp @@ -80,8 +80,8 @@ void KBCatalogListViewItem::setup() widthChanged(); - m_doc_msgid.reset(0); - m_doc_msgstr.reset(0); + m_doc_msgid.reset(); + m_doc_msgstr.reset(); makeDocAvailable(); @@ -170,7 +170,7 @@ void KBCatalogListViewItem::paintMsgStrCell(TQPainter* p, const TQColorGroup& cg void KBCatalogListViewItem::paintCell(TQPainter* p, const TQColorGroup& cg, int column, int width, int align) { - assert(m_doc_msgid.get() && m_doc_msgstr.get() && p); + assert(m_doc_msgid && m_doc_msgstr && p); // paint background (empty text) @@ -191,7 +191,7 @@ void KBCatalogListViewItem::paintCell(TQPainter* p, const TQColorGroup& cg, void KBCatalogListViewItem::makeDocAvailable() { - if (m_doc_msgid.get() && m_doc_msgstr.get()) + if (m_doc_msgid && m_doc_msgstr) return; assert(listView()); diff --git a/kbabel/kbabel/kbcataloglistviewitem.h b/kbabel/kbabel/kbcataloglistviewitem.h index 6384360f..a29ca9ba 100644 --- a/kbabel/kbabel/kbcataloglistviewitem.h +++ b/kbabel/kbabel/kbcataloglistviewitem.h @@ -65,8 +65,8 @@ private: TQString m_msgid; TQString m_msgstr; - std::auto_ptr<TQSimpleRichText> m_doc_msgid; - std::auto_ptr<TQSimpleRichText> m_doc_msgstr; + std::unique_ptr<TQSimpleRichText> m_doc_msgid; + std::unique_ptr<TQSimpleRichText> m_doc_msgstr; }; #endif diff --git a/kbabel/kbabel/kbcatalogview.cpp b/kbabel/kbabel/kbcatalogview.cpp index 1871b221..990eea93 100644 --- a/kbabel/kbabel/kbcatalogview.cpp +++ b/kbabel/kbabel/kbcatalogview.cpp @@ -49,8 +49,8 @@ KBCatalogView::KBCatalogView(KBCatalog* catalog, TQWidget* parent, Project::Ptr _currentIndex=1; // here we use 1 to accept update at opening a file - connect ( _project, TQT_SIGNAL (signalSettingsChanged()), this, TQT_SLOT (readProjectSettings()) ); - connect ( _catalog, TQT_SIGNAL (signalFileOpened(bool)), this, TQT_SLOT (readFileSettings() ) ); + connect ( _project, TQ_SIGNAL (signalSettingsChanged()), this, TQ_SLOT (readProjectSettings()) ); + connect ( _catalog, TQ_SIGNAL (signalFileOpened(bool)), this, TQ_SLOT (readFileSettings() ) ); readProjectSettings(); readFileSettings(); diff --git a/kbabel/kbabel/kbcharselect.cpp b/kbabel/kbabel/kbcharselect.cpp index 70977aaa..76a89d3f 100644 --- a/kbabel/kbabel/kbcharselect.cpp +++ b/kbabel/kbabel/kbcharselect.cpp @@ -61,8 +61,8 @@ KBCharSelect::KBCharSelect(TQWidget* parent,const char* name) scroll->addChild(_table); - connect( _table, TQT_SIGNAL( doubleClicked() ), this, TQT_SLOT( emitChar() ) ); - connect( _tableNum, TQT_SIGNAL( valueChanged(int) ), this, TQT_SLOT( setTab(int) )); + connect( _table, TQ_SIGNAL( doubleClicked() ), this, TQ_SLOT( emitChar() ) ); + connect( _tableNum, TQ_SIGNAL( valueChanged(int) ), this, TQ_SLOT( setTab(int) )); } void KBCharSelect::emitChar() diff --git a/kbabel/kbabel/kbhighlighting.cpp b/kbabel/kbabel/kbhighlighting.cpp index 3f9df538..85daae34 100644 --- a/kbabel/kbabel/kbhighlighting.cpp +++ b/kbabel/kbabel/kbhighlighting.cpp @@ -74,7 +74,7 @@ KBabelHighlighter::KBabelHighlighter( TQTextEdit * edit, KSpell *spell ) : TQObj readSettings( ); regexps << accelMarker + "[\\w]"; - connect( _edit, TQT_SIGNAL( textChanged( ) ), this, TQT_SLOT( highlight( ) ) ); + connect( _edit, TQ_SIGNAL( textChanged( ) ), this, TQ_SLOT( highlight( ) ) ); setSpellChecker(spell); } @@ -285,8 +285,8 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell ) { if( mSpell ) { - disconnect(mSpell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); + disconnect(mSpell, TQ_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); // cleanup the cache dict.clear(); @@ -296,11 +296,11 @@ void KBabelHighlighter::setSpellChecker( KSpell* spell ) if( mSpell ) { - connect(mSpell, TQT_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), - this, TQT_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); + connect(mSpell, TQ_SIGNAL(misspelling(const TQString &, const TQStringList &, unsigned int)), + this, TQ_SLOT(slotMisspelling(const TQString &, const TQStringList &, unsigned int))); // wait for KSpell to startup correctly - kapp->processEvents(500); + tdeApp->processEvents(500); } highlight(); diff --git a/kbabel/kbabel/main.cpp b/kbabel/kbabel/main.cpp index a6282e83..37132825 100644 --- a/kbabel/kbabel/main.cpp +++ b/kbabel/kbabel/main.cpp @@ -46,7 +46,7 @@ #include <kcursor.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kuniqueapplication.h> +#include <tdeuniqueapplication.h> #include <twin.h> #include <tqfile.h> @@ -87,7 +87,7 @@ private: }; -class KBabelApp : public KUniqueApplication +class KBabelApp : public TDEUniqueApplication { public: KBabelApp(); @@ -100,7 +100,7 @@ private: }; KBabelApp::KBabelApp() - : KUniqueApplication() + : TDEUniqueApplication() { kbInterface = new KBabelInterface; } @@ -126,7 +126,7 @@ int KBabelApp::newInstance() #endif { kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); @@ -162,7 +162,7 @@ int KBabelApp::newInstance() TQString m = TQString::fromLocal8Bit(msgid); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); kbInterface->gotoFileEntry(args->url(0).url().local8Bit(),m.utf8()); } else @@ -191,7 +191,7 @@ int KBabelApp::newInstance() } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); } @@ -237,7 +237,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int KURL u(TQString::fromLocal8Bit(url)); kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); KBabelMW *kb = KBabelMW::winForURL(u,project); if(kb) @@ -259,7 +259,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return ; } @@ -277,7 +277,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb->open(u,TQString::fromUtf8(package),false); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return; } @@ -293,7 +293,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int kb->open(u, TQString::fromUtf8(package),newWindow); kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return ; } @@ -310,7 +310,7 @@ void KBabelInterface::openURL(TQCString url, TQCString package, WId window, int } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); } void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilename, TQCString package, int newWindow) @@ -326,7 +326,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam const KURL t( TQString::fromLocal8Bit( openFilename ) ); kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); KBabelMW *kb = KBabelMW::winForURL(u, project); if(kb) @@ -356,7 +356,7 @@ void KBabelInterface::openTemplate(TQCString openFilename, TQCString saveFilenam } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); } void KBabelInterface::gotoFileEntry(TQCString url, TQCString m) @@ -496,7 +496,7 @@ void KBabelInterface::spellcheck(TQStringList fileList) KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& project, const TQString& package) const { kdDebug () << "Suspending DCOP" << endl; - kapp->dcopClient()->suspend(); + tdeApp->dcopClient()->suspend(); KBabelMW *kb = 0; if( !url.isEmpty() ) @@ -527,7 +527,7 @@ KBabelMW* KBabelInterface::findInstance( const KURL& url, const TQString& projec } kdDebug () << "Resuming DCOP" << endl; - kapp->dcopClient()->resume(); + tdeApp->dcopClient()->resume(); return kb; } @@ -593,10 +593,10 @@ int main(int argc, char **argv) TDECmdLineArgs::addCmdLineOptions( options ); // Add options from other components - KUniqueApplication::addCmdLineOptions(); + TDEUniqueApplication::addCmdLineOptions(); - if(!KUniqueApplication::start()) + if(!TDEUniqueApplication::start()) { return 0; } diff --git a/kbabel/kbabel/mymultilineedit.cpp b/kbabel/kbabel/mymultilineedit.cpp index 3d614f68..80bc4c90 100644 --- a/kbabel/kbabel/mymultilineedit.cpp +++ b/kbabel/kbabel/mymultilineedit.cpp @@ -77,7 +77,7 @@ MyMultiLineEdit::MyMultiLineEdit(int ID, TQWidget* parent,const char* name) setWordWrap( WidgetWidth ); viewport()->setAcceptDrops( false ); // we need our parent to get drops - connect(this, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT( onSelectionChanged() ) ); + connect(this, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT( onSelectionChanged() ) ); } void MyMultiLineEdit::onSelectionChanged() @@ -641,11 +641,11 @@ MsgMultiLineEdit::MsgMultiLineEdit(int ID, KSpell* spell, TQWidget* parent,const // this will setup bitBlt pixmaps setFont( font() ); highlighter = new KBabelHighlighter( this, spell ); - connect( this, TQT_SIGNAL( signalSyntaxHighlightingChanged( bool ) ), highlighter, TQT_SLOT( setSyntaxHighlighting( bool ) ) ); + connect( this, TQ_SIGNAL( signalSyntaxHighlightingChanged( bool ) ), highlighter, TQ_SLOT( setSyntaxHighlighting( bool ) ) ); - connect( this, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( paintSpacePoints() ) ); - connect( this, TQT_SIGNAL( cursorPositionChanged( int, int ) ), this, TQT_SLOT( paintSpacePoints(int, int) ) ); - connect( this, TQT_SIGNAL( textChanged() ), this, TQT_SLOT( emittedTextChanged() ) ); + connect( this, TQ_SIGNAL( selectionChanged() ), this, TQ_SLOT( paintSpacePoints() ) ); + connect( this, TQ_SIGNAL( cursorPositionChanged( int, int ) ), this, TQ_SLOT( paintSpacePoints(int, int) ) ); + connect( this, TQ_SIGNAL( textChanged() ), this, TQ_SLOT( emittedTextChanged() ) ); } MsgMultiLineEdit::~MsgMultiLineEdit () diff --git a/kbabel/kbabel/mymultilineedit.h b/kbabel/kbabel/mymultilineedit.h index 1c27d264..2fac95af 100644 --- a/kbabel/kbabel/mymultilineedit.h +++ b/kbabel/kbabel/mymultilineedit.h @@ -155,7 +155,7 @@ protected: bool _dontUpdate; protected slots: - virtual void insert ( const TQString & text, bool indent = FALSE, bool checkNewLine = TRUE, bool removeSelected = TRUE ); + virtual void insert ( const TQString & text, bool indent = false, bool checkNewLine = true, bool removeSelected = true ); virtual void emitCursorPosition(); signals: diff --git a/kbabel/kbabel/sourceview.cpp b/kbabel/kbabel/sourceview.cpp index 58013eac..6f7de0a1 100644 --- a/kbabel/kbabel/sourceview.cpp +++ b/kbabel/kbabel/sourceview.cpp @@ -54,7 +54,7 @@ SourceView::SourceView(KBCatalog* catalog,TQWidget *parent, Project::Ptr project _contextView = new SourceContext (this, project); layout->addWidget (_contextView); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)), this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)), this, TQ_SLOT(setDisabled(bool))); } void SourceView::updateView() diff --git a/kbabel/kbabel/taglistview.cpp b/kbabel/kbabel/taglistview.cpp index 3233ab57..326a0bc7 100644 --- a/kbabel/kbabel/taglistview.cpp +++ b/kbabel/kbabel/taglistview.cpp @@ -54,13 +54,13 @@ TagListView::TagListView(KBCatalog* catalog,TQWidget *parent, Project::Ptr proje layout->addWidget (_tagBox); - connect(_tagBox,TQT_SIGNAL(selected(const TQString&)) - , this, TQT_SIGNAL(signalTagSelected(const TQString&))); - connect(_tagBox,TQT_SIGNAL(highlighted(int)) - , this, TQT_SIGNAL(signalHighlightedTagChanged(int))); + connect(_tagBox,TQ_SIGNAL(selected(const TQString&)) + , this, TQ_SIGNAL(signalTagSelected(const TQString&))); + connect(_tagBox,TQ_SIGNAL(highlighted(int)) + , this, TQ_SIGNAL(signalHighlightedTagChanged(int))); - connect(_catalog, TQT_SIGNAL(signalFileOpened(bool)) - , this, TQT_SLOT(setDisabled(bool))); + connect(_catalog, TQ_SIGNAL(signalFileOpened(bool)) + , this, TQ_SLOT(setDisabled(bool))); } void TagListView::updateView() diff --git a/kbabel/kbabeldict/dictchooser.cpp b/kbabel/kbabeldict/dictchooser.cpp index bcd1fcbc..09227802 100644 --- a/kbabel/kbabeldict/dictchooser.cpp +++ b/kbabel/kbabeldict/dictchooser.cpp @@ -122,17 +122,17 @@ DictChooser::DictChooser(KBabelDictBox*b, TQStringList selected } - connect(selectedBox,TQT_SIGNAL(highlighted(int)), this - , TQT_SLOT(selectedMarked(int))); - connect(unselectedBox,TQT_SIGNAL(highlighted(int)), this - , TQT_SLOT(unselectedMarked(int))); - - connect(selectBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(select())); - connect(unselectBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(unselect())); - connect(upBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(up())); - connect(downBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(down())); - connect(configureBtn,TQT_SIGNAL(clicked()), this - , TQT_SLOT(configureSelected())); + connect(selectedBox,TQ_SIGNAL(highlighted(int)), this + , TQ_SLOT(selectedMarked(int))); + connect(unselectedBox,TQ_SIGNAL(highlighted(int)), this + , TQ_SLOT(unselectedMarked(int))); + + connect(selectBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(select())); + connect(unselectBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(unselect())); + connect(upBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(up())); + connect(downBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(down())); + connect(configureBtn,TQ_SIGNAL(clicked()), this + , TQ_SLOT(configureSelected())); selectedBox->installEventFilter(this); diff --git a/kbabel/kbabeldict/dictchooser.h b/kbabel/kbabeldict/dictchooser.h index 5bdc685a..d775412c 100644 --- a/kbabel/kbabeldict/dictchooser.h +++ b/kbabel/kbabeldict/dictchooser.h @@ -47,7 +47,7 @@ class TQPushButton; class TQListBoxItem; -class KDE_EXPORT DictChooser : public TQWidget +class TDE_EXPORT DictChooser : public TQWidget { TQ_OBJECT diff --git a/kbabel/kbabeldict/dictionarymenu.cpp b/kbabel/kbabeldict/dictionarymenu.cpp index 4b4f1002..ae414c91 100644 --- a/kbabel/kbabeldict/dictionarymenu.cpp +++ b/kbabel/kbabeldict/dictionarymenu.cpp @@ -50,12 +50,12 @@ DictionaryMenu::DictionaryMenu(TDEPopupMenu *popupMenu, TDEActionCollection *col if(popup) { - connect(popup,TQT_SIGNAL(activated(int)),this,TQT_SLOT(activated(int))); + connect(popup,TQ_SIGNAL(activated(int)),this,TQ_SLOT(activated(int))); } dictionaryMapper = new TQSignalMapper( this ); - connect( dictionaryMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( activated( int ) ) ); + connect( dictionaryMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( activated( int ) ) ); } @@ -81,15 +81,15 @@ void DictionaryMenu::clear() // create new mapper delete dictionaryMapper; dictionaryMapper = new TQSignalMapper( this ); - connect( dictionaryMapper, TQT_SIGNAL( mapped( int ) ), - this, TQT_SLOT( activated( int ) ) ); + connect( dictionaryMapper, TQ_SIGNAL( mapped( int ) ), + this, TQ_SLOT( activated( int ) ) ); } void DictionaryMenu::add(const TQString& name, const TQString& moduleId) { if(popup) { - TDEAction* dictionaryAction = new TDEAction( name, 0, dictionaryMapper, TQT_SLOT(map()), actionCollection, moduleId.utf8() ); + TDEAction* dictionaryAction = new TDEAction( name, 0, dictionaryMapper, TQ_SLOT(map()), actionCollection, moduleId.utf8() ); uint id = maxId++; dictionaryAction->plug(popup, id); @@ -116,7 +116,7 @@ void DictionaryMenu::add(const TQString& n, const TQString& moduleId } TDEShortcut k(keyString); - TDEAction* dictionaryAction = new TDEAction( name, k, dictionaryMapper, TQT_SLOT(map()), actionCollection, key.arg(moduleId).utf8() ); + TDEAction* dictionaryAction = new TDEAction( name, k, dictionaryMapper, TQ_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 62e216e0..635ad013 100644 --- a/kbabel/kbabeldict/dictionarymenu.h +++ b/kbabel/kbabeldict/dictionarymenu.h @@ -37,13 +37,13 @@ #include <tqobject.h> #include <tqstringlist.h> #include <tqguardedptr.h> -#include <kdemacros.h> +#include <tdemacros.h> class TQSignalMapper; class TDEPopupMenu; class TDEActionCollection; -class KDE_EXPORT DictionaryMenu : public TQObject +class TDE_EXPORT DictionaryMenu : public TQObject { TQ_OBJECT diff --git a/kbabel/kbabeldict/kbabeldict.cpp b/kbabel/kbabeldict/kbabeldict.cpp index 03d08e38..0777a1b9 100644 --- a/kbabel/kbabeldict/kbabeldict.cpp +++ b/kbabel/kbabeldict/kbabeldict.cpp @@ -47,13 +47,13 @@ KBabelDict::KBabelDict() , i18n("About"), i18n("About Module") , i18n("Hide Sett&ings")) { - connect(this, TQT_SIGNAL(closeClicked()),this,TQT_SLOT(saveConfig())); - connect(this, TQT_SIGNAL(closeClicked()),this,TQT_SLOT(quit())); + connect(this, TQ_SIGNAL(closeClicked()),this,TQ_SLOT(saveConfig())); + connect(this, TQ_SIGNAL(closeClicked()),this,TQ_SLOT(quit())); view = new KBabelDictView(this); - connect(this, TQT_SIGNAL(user1Clicked()), view, TQT_SLOT(about())); - connect(this, TQT_SIGNAL(user2Clicked()), view, TQT_SLOT(aboutModule())); - connect(this, TQT_SIGNAL(user3Clicked()), this, TQT_SLOT(togglePref())); + connect(this, TQ_SIGNAL(user1Clicked()), view, TQ_SLOT(about())); + connect(this, TQ_SIGNAL(user2Clicked()), view, TQ_SLOT(aboutModule())); + connect(this, TQ_SIGNAL(user3Clicked()), this, TQ_SLOT(togglePref())); // HACK: hide default button, otherwise it would be Help button showButtonOK(false); @@ -92,7 +92,7 @@ void KBabelDict::readConfig() void KBabelDict::quit() { - kapp->quit(); + tdeApp->quit(); } void KBabelDict::togglePref() diff --git a/kbabel/kbabeldict/kbabeldictbox.cpp b/kbabel/kbabeldict/kbabeldictbox.cpp index 1be091ff..8d0a7a97 100644 --- a/kbabel/kbabeldict/kbabeldictbox.cpp +++ b/kbabel/kbabeldict/kbabeldictbox.cpp @@ -52,7 +52,7 @@ #include <tdelistview.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdeglobal.h> #include <kdebug.h> #include <ktrader.h> @@ -254,12 +254,12 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) listButton = new TQToolButton(TQt::UpArrow,this); listButton->setFixedSize(20,15); listButton->setAutoRepeat(false); - connect(listButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showListOnly())); + connect(listButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(showListOnly())); hbox->addWidget(listButton); detailButton = new TQToolButton(TQt::DownArrow,this); detailButton->setFixedSize(20,15); detailButton->setAutoRepeat(false); - connect(detailButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(showDetailsOnly())); + connect(detailButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(showDetailsOnly())); hbox->addWidget(detailButton); mainLayout->addLayout(hbox); @@ -291,14 +291,14 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) resultListView->installEventFilter(this); connect(resultListView - , TQT_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint&,int)) - , this, TQT_SLOT(editFile())); - connect(resultListView, TQT_SIGNAL(returnPressed(TQListViewItem *)) - , this, TQT_SLOT(editFile())); + , TQ_SIGNAL(doubleClicked(TQListViewItem *,const TQPoint&,int)) + , this, TQ_SLOT(editFile())); + connect(resultListView, TQ_SIGNAL(returnPressed(TQListViewItem *)) + , this, TQ_SLOT(editFile())); connect(resultListView - , TQT_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint&)) + , TQ_SIGNAL(contextMenu(TDEListView *,TQListViewItem *,const TQPoint&)) , this - , TQT_SLOT(showContextMenu(TDEListView *,TQListViewItem *,const TQPoint&))); + , TQ_SLOT(showContextMenu(TDEListView *,TQListViewItem *,const TQPoint&))); resultSplitter->setResizeMode(viewContainer,TQSplitter::KeepSize); TQValueList<int> sizes; @@ -388,7 +388,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) if(factory) { - SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this) + SearchEngine *e = (SearchEngine *)factory->create(this , "searchengine", "SearchEngine"); if(!e) { @@ -419,7 +419,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) if(factory) { - SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this) + SearchEngine *e = (SearchEngine *)factory->create(this , "searchengine", "SearchEngine"); if(!e) { @@ -447,7 +447,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) if(factory) { - SearchEngine *e = (SearchEngine *)factory->create(TQT_TQOBJECT(this) + SearchEngine *e = (SearchEngine *)factory->create(this , "searchengine", "SearchEngine"); if(!e) { @@ -464,9 +464,9 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) } } - connect(nextButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotNextResult())); - connect(prevButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(slotPrevResult())); - connect(moreButton,TQT_SIGNAL(clicked()),this,TQT_SLOT(nextInfo())); + connect(nextButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotNextResult())); + connect(prevButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(slotPrevResult())); + connect(moreButton,TQ_SIGNAL(clicked()),this,TQ_SLOT(nextInfo())); origView->installEventFilter(this); @@ -475,8 +475,8 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl ) resultListView->setSorting(0,false); resultListView->setAllColumnsShowFocus(true); - connect(resultListView,TQT_SIGNAL(selectionChanged(TQListViewItem*)) - , this, TQT_SLOT(showResult(TQListViewItem*))); + connect(resultListView,TQ_SIGNAL(selectionChanged(TQListViewItem*)) + , this, TQ_SLOT(showResult(TQListViewItem*))); } /* @@ -490,18 +490,18 @@ void KBabelDictBox::registerModule( SearchEngine* e ) { active = 0; moduleList.append(e); - connect(e, TQT_SIGNAL(started()),this,TQT_SIGNAL(searchStarted())); - connect(e, TQT_SIGNAL(finished()),this,TQT_SIGNAL(searchStopped())); - connect(e, TQT_SIGNAL(finished()),this - ,TQT_SLOT(clearModuleResults())); - connect(e, TQT_SIGNAL(progress(int)),this,TQT_SIGNAL(progressed(int))); - connect(e, TQT_SIGNAL(progressStarts(const TQString&)),this - , TQT_SIGNAL(progressStarts(const TQString&))); - connect(e, TQT_SIGNAL(progressEnds()),this,TQT_SIGNAL(progressEnds())); - connect(e, TQT_SIGNAL(resultFound(const SearchResult*)), this - , TQT_SLOT(addResult(const SearchResult*))); - connect(e, TQT_SIGNAL(hasError(const TQString&)), this - , TQT_SIGNAL(errorInModule(const TQString&))); + connect(e, TQ_SIGNAL(started()),this,TQ_SIGNAL(searchStarted())); + connect(e, TQ_SIGNAL(finished()),this,TQ_SIGNAL(searchStopped())); + connect(e, TQ_SIGNAL(finished()),this + ,TQ_SLOT(clearModuleResults())); + connect(e, TQ_SIGNAL(progress(int)),this,TQ_SIGNAL(progressed(int))); + connect(e, TQ_SIGNAL(progressStarts(const TQString&)),this + , TQ_SIGNAL(progressStarts(const TQString&))); + connect(e, TQ_SIGNAL(progressEnds()),this,TQ_SIGNAL(progressEnds())); + connect(e, TQ_SIGNAL(resultFound(const SearchResult*)), this + , TQ_SLOT(addResult(const SearchResult*))); + connect(e, TQ_SIGNAL(hasError(const TQString&)), this + , TQ_SIGNAL(errorInModule(const TQString&))); } void KBabelDictBox::saveSettings(TDEConfigBase *config) @@ -661,8 +661,8 @@ void KBabelDictBox::startSearch(const TQString text) if(engine->isSearching()) { engine->stopSearch(); - connect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedSearch())); + connect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedSearch())); searchText=text; } @@ -687,8 +687,8 @@ void KBabelDictBox::startTranslationSearch(const TQString text) if(engine->isSearching()) { engine->stopSearch(); - connect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedTranslationSearch())); + connect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedTranslationSearch())); searchText=text; } @@ -713,13 +713,13 @@ void KBabelDictBox::startDelayedSearch(const TQString text) { engine->stopSearch(); - connect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedSearch())); + connect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedSearch())); } else { - TQTimer::singleShot(5,this,TQT_SLOT(startDelayedSearch())); + TQTimer::singleShot(5,this,TQ_SLOT(startDelayedSearch())); } } } @@ -741,13 +741,13 @@ void KBabelDictBox::startDelayedTranslationSearch(const TQString text) { engine->stopSearch(); - connect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedTranslationSearch())); + connect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedTranslationSearch())); } else { - TQTimer::singleShot(5,this,TQT_SLOT(startDelayedTranslationSearch())); + TQTimer::singleShot(5,this,TQ_SLOT(startDelayedTranslationSearch())); } } } @@ -824,8 +824,8 @@ void KBabelDictBox::startDelayedSearch() } else { - disconnect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedSearch())); + disconnect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedSearch())); engine->startSearch(searchText); @@ -844,8 +844,8 @@ void KBabelDictBox::startDelayedTranslationSearch() } else { - disconnect(this, TQT_SIGNAL(searchStopped()), this - , TQT_SLOT(startDelayedTranslationSearch())); + disconnect(this, TQ_SIGNAL(searchStopped()), this + , TQ_SLOT(startDelayedTranslationSearch())); engine->startSearchInTranslation(searchText); @@ -1447,7 +1447,7 @@ void KBabelDictBox::setRMBMenu(TQPopupMenu *popup) popup->insertSeparator(); editFileIndex = popup->insertItem(i18n("Edit File") - , this, TQT_SLOT(editFile())); + , this, TQ_SLOT(editFile())); popup->setItemEnabled(editFileIndex,false); KContextMenuManager::insert(origView,popup); @@ -1513,12 +1513,12 @@ void KBabelDictBox::configure(const TQString& id, bool modal) PrefWidget *prefWidget = e->preferencesWidget(dialog); dialog->setMainWidget(prefWidget); - connect(dialog, TQT_SIGNAL(okClicked()),prefWidget,TQT_SLOT(apply())); - connect(dialog, TQT_SIGNAL(applyClicked()),prefWidget,TQT_SLOT(apply())); - connect(dialog, TQT_SIGNAL(defaultClicked()),prefWidget,TQT_SLOT(standard())); - connect(dialog, TQT_SIGNAL(cancelClicked()),prefWidget,TQT_SLOT(cancel())); + connect(dialog, TQ_SIGNAL(okClicked()),prefWidget,TQ_SLOT(apply())); + connect(dialog, TQ_SIGNAL(applyClicked()),prefWidget,TQ_SLOT(apply())); + connect(dialog, TQ_SIGNAL(defaultClicked()),prefWidget,TQ_SLOT(standard())); + connect(dialog, TQ_SIGNAL(cancelClicked()),prefWidget,TQ_SLOT(cancel())); - connect(dialog, TQT_SIGNAL(finished()),this,TQT_SLOT(destroyConfigDialog())); + connect(dialog, TQ_SIGNAL(finished()),this,TQ_SLOT(destroyConfigDialog())); prefDialogs.insert(id,dialog); @@ -1676,7 +1676,7 @@ void KBabelDictBox::editFile() msgid = result->found.first(); } - DCOPClient *dcop = kapp->dcopClient(); + DCOPClient *dcop = tdeApp->dcopClient(); QCStringList list = dcop->registeredApplications(); int index = list.findIndex("kbabel"); @@ -1691,7 +1691,7 @@ void KBabelDictBox::editFile() argList.append("--gotomsgid"); argList.append(msgid.local8Bit()); argList.append(url.local8Bit()); - kapp->tdeinitExec("kbabel",argList,&error); + tdeApp->tdeinitExec("kbabel",argList,&error); if(!error.isNull()) { KMessageBox::sorry(this diff --git a/kbabel/kbabeldict/kbabeldictbox.h b/kbabel/kbabeldict/kbabeldictbox.h index 5e506793..859df4af 100644 --- a/kbabel/kbabeldict/kbabeldictbox.h +++ b/kbabel/kbabeldict/kbabeldictbox.h @@ -60,7 +60,7 @@ struct ModuleInfo }; -class KDE_EXPORT KBabelDictBox : public TQWidget, virtual public KBabelDictIFace +class TDE_EXPORT KBabelDictBox : public TQWidget, virtual public KBabelDictIFace { TQ_OBJECT diff --git a/kbabel/kbabeldict/kbabeldictview.cpp b/kbabel/kbabeldict/kbabeldictview.cpp index 7964c65a..0579dee8 100644 --- a/kbabel/kbabeldict/kbabeldictview.cpp +++ b/kbabel/kbabeldict/kbabeldictview.cpp @@ -158,25 +158,25 @@ KBabelDictView::KBabelDictView( TQWidget* parent, const char* name, WFlags fl ) progressLabel = new TQLabel(h); progressBar = new KProgress(h); - connect(textEdit,TQT_SIGNAL(returnPressed()),startButton,TQT_SLOT(animateClick())); - connect(startButton,TQT_SIGNAL(clicked()),this, TQT_SLOT(startSearch())); - connect(stopButton, TQT_SIGNAL(clicked()), dictBox,TQT_SLOT(slotStopSearch())); - connect(editButton, TQT_SIGNAL(clicked()), dictBox, TQT_SLOT(edit())); - connect(dictBox, TQT_SIGNAL(searchStarted()), this, TQT_SLOT(searchStarted())); - connect(dictBox, TQT_SIGNAL(searchStopped()), this, TQT_SLOT(searchStopped())); - connect(dictBox, TQT_SIGNAL(progressed(int)), progressBar, TQT_SLOT(setProgress(int))); - connect(dictBox, TQT_SIGNAL(activeModuleChanged(bool)) - , editButton, TQT_SLOT(setEnabled(bool))); + connect(textEdit,TQ_SIGNAL(returnPressed()),startButton,TQ_SLOT(animateClick())); + connect(startButton,TQ_SIGNAL(clicked()),this, TQ_SLOT(startSearch())); + connect(stopButton, TQ_SIGNAL(clicked()), dictBox,TQ_SLOT(slotStopSearch())); + connect(editButton, TQ_SIGNAL(clicked()), dictBox, TQ_SLOT(edit())); + connect(dictBox, TQ_SIGNAL(searchStarted()), this, TQ_SLOT(searchStarted())); + connect(dictBox, TQ_SIGNAL(searchStopped()), this, TQ_SLOT(searchStopped())); + connect(dictBox, TQ_SIGNAL(progressed(int)), progressBar, TQ_SLOT(setProgress(int))); + connect(dictBox, TQ_SIGNAL(activeModuleChanged(bool)) + , editButton, TQ_SLOT(setEnabled(bool))); - connect(dictBox, TQT_SIGNAL(progressStarts(const TQString&)) - , this, TQT_SLOT(progressStarted(const TQString&))); - connect(dictBox, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(progressStopped())); + connect(dictBox, TQ_SIGNAL(progressStarts(const TQString&)) + , this, TQ_SLOT(progressStarted(const TQString&))); + connect(dictBox, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(progressStopped())); - connect(moduleCombo, TQT_SIGNAL(activated(int)), - dictBox, TQT_SLOT(setActiveModule(int))); - connect(dictBox, TQT_SIGNAL(activeModuleChanged(int)) - , this, TQT_SLOT(switchModule(int))); - connect(clearButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotClearSearch())); + connect(moduleCombo, TQ_SIGNAL(activated(int)), + dictBox, TQ_SLOT(setActiveModule(int))); + connect(dictBox, TQ_SIGNAL(activeModuleChanged(int)) + , this, TQ_SLOT(switchModule(int))); + connect(clearButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotClearSearch())); } /* diff --git a/kbabel/kbabeldict/kbabelsplash.cpp b/kbabel/kbabeldict/kbabelsplash.cpp index 56c5e3a8..655f6425 100644 --- a/kbabel/kbabeldict/kbabelsplash.cpp +++ b/kbabel/kbabeldict/kbabelsplash.cpp @@ -36,7 +36,7 @@ #include <tqfontmetrics.h> #include <tqpainter.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> KBabelSplash* KBabelSplash::instance = 0; diff --git a/kbabel/kbabeldict/main.cpp b/kbabel/kbabeldict/main.cpp index 98d00d05..77ad6e48 100644 --- a/kbabel/kbabeldict/main.cpp +++ b/kbabel/kbabeldict/main.cpp @@ -91,8 +91,8 @@ KBabelDictApplication::KBabelDictApplication() TDEApplication::restoreOverrideCursor(); } - TQObject::connect( topLevel, TQT_SIGNAL( destroyed() ), - this, TQT_SLOT( quit() ) ); + TQObject::connect( topLevel, TQ_SIGNAL( destroyed() ), + this, TQ_SLOT( quit() ) ); } KBabelDictApplication::~KBabelDictApplication() diff --git a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp index 5423bca9..9fee3217 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/KDBSearchEngine.cpp @@ -39,7 +39,7 @@ #include <tdemessagebox.h> #include <tdefiledialog.h> #include <kurlrequester.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "tdeapplication.h" #include "KDBSearchEngine.h" @@ -82,8 +82,8 @@ SearchEngine (parent, name) dbOpened = false; dbname = ""; lasterror = i18n ("No error"); - connect (this, TQT_SIGNAL (hasError (const TQString &)), - TQT_SLOT (setLastError (const TQString &))); + connect (this, TQ_SIGNAL (hasError (const TQString &)), + TQ_SLOT (setLastError (const TQString &))); IAmReady = true; // I don't know if it is a good idea, no DB loaded!!! @@ -91,8 +91,8 @@ SearchEngine (parent, name) searching = false; stopNow = false; - norm = false; // Normalize white space = FALSE - comm = true; // Remove Comments = TRUE + norm = false; // Normalize white space = false + comm = true; // Remove Comments = true } @@ -474,7 +474,7 @@ KDBSearchEngine::messagesForFilter (const SearchFilter * filter, if (count % step == 0) { emit progress (100 * count / totalRecord); - kapp->processEvents (100); + tdeApp->processEvents (100); } if (stopNow) { @@ -548,9 +548,9 @@ KDBSearchEngine::repeat () new TQProgressDialog (i18n ("Looking for repetitions"), i18n ("Stop"), 100); - connect (this, TQT_SIGNAL (progress (int)), pd, TQT_SLOT (setProgress (int))); - connect (this, TQT_SIGNAL (finished ()), pd, TQT_SLOT (close ())); - connect (pd, TQT_SIGNAL (cancelled ()), this, TQT_SLOT (stopSearch ())); + connect (this, TQ_SIGNAL (progress (int)), pd, TQ_SLOT (setProgress (int))); + connect (this, TQ_SIGNAL (finished ()), pd, TQ_SLOT (close ())); + connect (pd, TQ_SIGNAL (cancelled ()), this, TQ_SLOT (stopSearch ())); TQString txt = "// %1 repetitions, %2 translation(s)\ni18n(\"%3\");\n"; @@ -582,7 +582,7 @@ KDBSearchEngine::repeat () if (count % step == 0) { emit progress (100 * count / totalRecord); - kapp->processEvents (100); + tdeApp->processEvents (100); } if (stopNow) { @@ -755,7 +755,7 @@ KDBSearchEngine::startSearchNow (int searchmode) step = 100; emit progress (0); - kapp->processEvents (100); + tdeApp->processEvents (100); if (stopNow) { stopNow = false; @@ -775,7 +775,7 @@ KDBSearchEngine::startSearchNow (int searchmode) { emit progress (100 * count / /*TQMAX( */ totalprogress /*,1) */ ); - kapp->processEvents (100); + tdeApp->processEvents (100); if (stopNow) { @@ -1208,15 +1208,15 @@ KDBSearchEngine::preferencesWidget (TQWidget * parent) pw = new PreferencesWidget (parent); setSettings (); - connect (pw, TQT_SIGNAL (restoreNow ()), this, TQT_SLOT (setSettings ())); - connect (pw, TQT_SIGNAL (applyNow ()), this, TQT_SLOT (updateSettings ())); - connect (pw, TQT_SIGNAL (destroyed ()), this, TQT_SLOT (prefDestr ())); - connect (pw->dbpw->scanPB_2, TQT_SIGNAL (clicked ()), this, TQT_SLOT (scan ())); - connect (pw->dbpw->scanrecPB, TQT_SIGNAL (clicked ()), this, - TQT_SLOT (scanRecur ())); - connect (pw->dbpw->scanFilePB, TQT_SIGNAL (clicked ()), this, - TQT_SLOT (scanFile ())); - connect (pw->dbpw->repeatPB, TQT_SIGNAL (clicked ()), this, TQT_SLOT (repeat ())); + connect (pw, TQ_SIGNAL (restoreNow ()), this, TQ_SLOT (setSettings ())); + connect (pw, TQ_SIGNAL (applyNow ()), this, TQ_SLOT (updateSettings ())); + connect (pw, TQ_SIGNAL (destroyed ()), this, TQ_SLOT (prefDestr ())); + connect (pw->dbpw->scanPB_2, TQ_SIGNAL (clicked ()), this, TQ_SLOT (scan ())); + connect (pw->dbpw->scanrecPB, TQ_SIGNAL (clicked ()), this, + TQ_SLOT (scanRecur ())); + connect (pw->dbpw->scanFilePB, TQ_SIGNAL (clicked ()), this, + TQ_SLOT (scanFile ())); + connect (pw->dbpw->repeatPB, TQ_SIGNAL (clicked ()), this, TQ_SLOT (repeat ())); return pw; @@ -1246,32 +1246,32 @@ KDBSearchEngine::scanRecur () } if (pw) { - connect (sca, TQT_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB, - TQT_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB, + TQ_SLOT (setProgress (int))); } - connect (sca, TQT_SIGNAL (patternProgress (int)), TQT_SIGNAL (progress (int))); //Kbabel progress bar + connect (sca, TQ_SIGNAL (patternProgress (int)), TQ_SIGNAL (progress (int))); //Kbabel progress bar - connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int))); - connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString))); + connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int))); + connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString))); progressStarts (i18n ("Scanning folder %1").arg (cvsdir)); - connect (sca, TQT_SIGNAL (patternFinished ()), TQT_SIGNAL (progressEnds ())); + connect (sca, TQ_SIGNAL (patternFinished ()), TQ_SIGNAL (progressEnds ())); sca->scanPattern (cvsdir, "*.po", true); - disconnect (this, TQT_SIGNAL (progress (int))); -//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) ); - disconnect (this, TQT_SIGNAL (progressEnds ())); + disconnect (this, TQ_SIGNAL (progress (int))); +//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) ); + disconnect (this, TQ_SIGNAL (progressEnds ())); if (pw) { - disconnect (pw->dbpw->totalPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int))); + disconnect (pw->dbpw->totalPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int))); } totalRecord = dm->count (); @@ -1304,32 +1304,32 @@ KDBSearchEngine::scan () } if (pw) { - connect (sca, TQT_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB, - TQT_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (patternProgress (int)), pw->dbpw->totalPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB, + TQ_SLOT (setProgress (int))); } - connect (sca, TQT_SIGNAL (patternProgress (int)), TQT_SIGNAL (progress (int))); + connect (sca, TQ_SIGNAL (patternProgress (int)), TQ_SIGNAL (progress (int))); progressStarts (i18n ("Scanning folder %1").arg (cvsdir)); - connect (sca, TQT_SIGNAL (patternFinished ()), TQT_SIGNAL (progressEnds ())); + connect (sca, TQ_SIGNAL (patternFinished ()), TQ_SIGNAL (progressEnds ())); - connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int))); - connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString))); + connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int))); + connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString))); sca->scanPattern (cvsdir, "*.po", false); - disconnect (this, TQT_SIGNAL (progress (int))); -//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) ); - disconnect (this, TQT_SIGNAL (progressEnds ())); + disconnect (this, TQ_SIGNAL (progress (int))); +//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) ); + disconnect (this, TQ_SIGNAL (progressEnds ())); if (pw) { - disconnect (pw->dbpw->totalPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int))); + disconnect (pw->dbpw->totalPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int))); } totalRecord = dm->count (); @@ -1363,31 +1363,31 @@ KDBSearchEngine::scanFile () } if (pw) { - connect (sca, TQT_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, - TQT_SLOT (setProgress (int))); - connect (sca, TQT_SIGNAL (fileProgress (int)), pw->dbpw->processPB, - TQT_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileLoading (int)), pw->dbpw->loadingPB, + TQ_SLOT (setProgress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), pw->dbpw->processPB, + TQ_SLOT (setProgress (int))); } - connect (sca, TQT_SIGNAL (fileProgress (int)), TQT_SIGNAL (progress (int))); + connect (sca, TQ_SIGNAL (fileProgress (int)), TQ_SIGNAL (progress (int))); progressStarts (i18n ("Scanning file %1").arg (directory (cvsdir, 0))); - connect (sca, TQT_SIGNAL (fileFinished ()), TQT_SIGNAL (progressEnds ())); + connect (sca, TQ_SIGNAL (fileFinished ()), TQ_SIGNAL (progressEnds ())); - connect (sca, TQT_SIGNAL (added (int)), pw, TQT_SLOT (setEntries (int))); - connect (sca, TQT_SIGNAL (filename (TQString)), pw, TQT_SLOT (setName (TQString))); + connect (sca, TQ_SIGNAL (added (int)), pw, TQ_SLOT (setEntries (int))); + connect (sca, TQ_SIGNAL (filename (TQString)), pw, TQ_SLOT (setName (TQString))); sca->scanFile (cvsdir); - sca->disconnect (TQT_SIGNAL (fileProgress (int)), this, - TQT_SIGNAL (progress (int))); -//disconnect(TQT_SIGNAL(patternStarted()),this,TQT_SIGNAL(started()) ); - sca->disconnect (TQT_SIGNAL (fileFinished ()), this, - TQT_SIGNAL (progressEnds ())); + sca->disconnect (TQ_SIGNAL (fileProgress (int)), this, + TQ_SIGNAL (progress (int))); +//disconnect(TQ_SIGNAL(patternStarted()),this,TQ_SIGNAL(started()) ); + sca->disconnect (TQ_SIGNAL (fileFinished ()), this, + TQ_SIGNAL (progressEnds ())); if (pw) { - disconnect (pw->dbpw->loadingPB, TQT_SLOT (setProgress (int))); - disconnect (pw->dbpw->processPB, TQT_SLOT (setProgress (int))); + disconnect (pw->dbpw->loadingPB, TQ_SLOT (setProgress (int))); + disconnect (pw->dbpw->processPB, TQ_SLOT (setProgress (int))); } totalRecord = dm->count (); @@ -1715,7 +1715,7 @@ TQValueList < KeyAndScore > KDBSearchEngine::searchWords (TQString phrase, { emit progress (100 * count / totalprogress); - kapp->processEvents (100); + tdeApp->processEvents (100); } if (stopNow) { diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp index 183b1e4d..8ea17024 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbscan.cpp @@ -121,7 +121,7 @@ Catalog * catalog=new Catalog(this,"ScanPoCatalog"); TQString location=fileName.right(fileName.length()-fileName.findRev("/")-1); -connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); +connect(catalog,TQ_SIGNAL(signalProgress(int)),this,TQ_SIGNAL(fileLoading(int))); emit filename(location); emit fileProgress(0); emit fileLoading(0); @@ -159,7 +159,7 @@ for (i=0;i<tot;i++) //Skip header = ???? { emit fileProgress(100*i/tot); emit added(count); - kapp->processEvents(100); + tdeApp->processEvents(100); } fuzzy=catalog->isFuzzy(i); diff --git a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp index 2273a9c4..6b51da7b 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/dbse_factory.cpp @@ -1,6 +1,6 @@ #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> @@ -10,7 +10,7 @@ extern "C" { - KDE_EXPORT void *init_kbabeldict_dbsearchengine() + TDE_EXPORT void *init_kbabeldict_dbsearchengine() { return new DbSeFactory; } diff --git a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp index e87294e4..1c82c47a 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine/preferenceswidget.cpp @@ -9,7 +9,7 @@ #include <kurlrequester.h> #include <tqtoolbutton.h> #include <klineedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include "dbseprefwidget.h" #include "preferenceswidget.h" @@ -27,7 +27,7 @@ PreferencesWidget::PreferencesWidget(TQWidget *parent, const char* name) layout->addWidget(dbpw); resize(TQSize(200,200).expandedTo(minimumSizeHint())); -// connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1())); +// connect(dbpw->browseTB_3,TQ_SIGNAL(clicked()),TQ_SLOT(browse1())); emit restoreNow(); //Fill with actual params. diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp index 2d564267..1399cc6f 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/KDBSearchEngine2.cpp @@ -39,7 +39,7 @@ #include <kurlrequester.h> #include <tqcheckbox.h> #include <knuminput.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdemessagebox.h> #include <tqmap.h> @@ -55,7 +55,7 @@ KDBSearchEngine2::KDBSearchEngine2(TQObject *parent,const char*name) di=0; //Database Interface is not yet initialized - connect(this,TQT_SIGNAL(hasError(TQString)),TQT_SLOT(setLastError(TQString))); + connect(this,TQ_SIGNAL(hasError(TQString)),TQ_SLOT(setLastError(TQString))); searching=false; // i'm not searching iAmReady=true; //there are no reason to say I'm not ready. @@ -134,8 +134,8 @@ bool KDBSearchEngine2::startSearch(TQString str) strategy.addAlgorithm(&wbyw); - connect(&strategy,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult))); - strategy.exec(searchingString); disconnect(&strategy,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult))); + connect(&strategy,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult))); + strategy.exec(searchingString); disconnect(&strategy,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult))); kdDebug(0) << "End of search for " << searchingString << endl; @@ -230,7 +230,7 @@ bool KDBSearchEngine2::init() else { di = new DataBaseInterface(dbDirectory,&settings); - connect(di,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SLOT(receiveResult(QueryResult))); + connect(di,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SLOT(receiveResult(QueryResult))); //FIXME: what wbout ready() if(!di->mainOk()) return false; //check if the main DB is OK. @@ -261,16 +261,16 @@ PrefWidget * KDBSearchEngine2::preferencesWidget(TQWidget *parent) pw = new KDB2PreferencesWidget(parent); kdDebug(0) << "new KDB2 preferences widget" << endl; setSettings(); - connect(pw,TQT_SIGNAL(restoreNow()),this,TQT_SLOT(setSettings())); - connect(pw,TQT_SIGNAL(applyNow()),this,TQT_SLOT(updateSettings())); - connect(pw,TQT_SIGNAL(destroyed()),this,TQT_SLOT(prefDestr())); + connect(pw,TQ_SIGNAL(restoreNow()),this,TQ_SLOT(setSettings())); + connect(pw,TQ_SIGNAL(applyNow()),this,TQ_SLOT(updateSettings())); + connect(pw,TQ_SIGNAL(destroyed()),this,TQ_SLOT(prefDestr())); - connect(pw->dbpw->scanAll,TQT_SIGNAL(clicked()),this,TQT_SLOT(scanAllPressed())); - connect(pw->dbpw->scanSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(scanNowPressed())); - connect(pw->dbpw->addSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(addSource())); - connect(pw->dbpw->editSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(editSource())); - connect(pw->dbpw->removeSource,TQT_SIGNAL(clicked()),this,TQT_SLOT(removeSource())); + connect(pw->dbpw->scanAll,TQ_SIGNAL(clicked()),this,TQ_SLOT(scanAllPressed())); + connect(pw->dbpw->scanSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(scanNowPressed())); + connect(pw->dbpw->addSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(addSource())); + connect(pw->dbpw->editSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(editSource())); + connect(pw->dbpw->removeSource,TQ_SIGNAL(clicked()),this,TQ_SLOT(removeSource())); return pw; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp index 466b68e5..fc3fd048 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/algorithms.cpp @@ -42,12 +42,12 @@ DataBaseInterface::ResultList GenericSearchAlgorithm::exec(const TQString& query uint countResults=0; for(TQValueList<AbstractSearchAlgorithm *>::iterator algoit = algoChain.begin(); algoit!=algoChain.end() && countResults < maxResults; algoit++) { - connect(*algoit,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SIGNAL(newResult(QueryResult))); + connect(*algoit,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SIGNAL(newResult(QueryResult))); kdDebug(0) << "Algo pointer" << (*algoit) << endl; res+=(*algoit)->exec(query); countResults=res.count(); kdDebug(0) << "Count = " << countResults << endl; - disconnect(*algoit,TQT_SIGNAL(newResult(QueryResult)),this,TQT_SIGNAL(newResult(QueryResult))); + disconnect(*algoit,TQ_SIGNAL(newResult(QueryResult)),this,TQ_SIGNAL(newResult(QueryResult))); } return res; } diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp index aa64a4b0..862e7db3 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/database.cpp @@ -172,7 +172,7 @@ DataBaseInterface::MainEntry DataBaseInterface::get(const TQString& query,Search //int r= main->get(&k,&d); // kdDebug(0) << "MAINDB->GET returned: " << r << endl; - if(counter%5==0) kapp->processEvents(100); + if(counter%5==0) tdeApp->processEvents(100); // kdDebug(0) << "events processed" << endl; return qMakePair(k,d); @@ -726,7 +726,7 @@ DataBaseInterface::MainEntry DataBaseInterface::getSentence( const TQString & qu DBItemMainKey k(query); DBItemMainData d; sentence->get(&k,&d); - if(counter%5==0) kapp->processEvents(100); + if(counter%5==0) tdeApp->processEvents(100); return qMakePair(k,d); } diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp index 2fe4ae98..9ae67fde 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbscan.cpp @@ -205,7 +205,7 @@ Catalog * catalog=new Catalog(this,"ScanPoCatalog"); TQString pretty=u.prettyURL(); TQString location=pretty.right(pretty.length()-pretty.findRev("/")-1); -connect(catalog,TQT_SIGNAL(signalProgress(int)),this,TQT_SIGNAL(fileLoading(int))); +connect(catalog,TQ_SIGNAL(signalProgress(int)),this,TQ_SIGNAL(fileLoading(int))); emit filename(location); emit fileProgress(0); emit fileLoading(0); @@ -243,7 +243,7 @@ for (i=0;i<tot;i++) //Skip header = ???? { emit fileProgress(100*i/tot); emit added(count); - kapp->processEvents(100); + tdeApp->processEvents(100); } fuzzy=catalog->isFuzzy(i); diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp index ad2aa0dd..a51001ae 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/dbse2_factory.cpp @@ -1,6 +1,6 @@ #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> @@ -10,7 +10,7 @@ extern "C" { - KDE_EXPORT void *init_kbabeldict_dbsearchengine2() + TDE_EXPORT void *init_kbabeldict_dbsearchengine2() // void *init_libdbsearchengine2() { return new DbSe2Factory; diff --git a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp index 0b332eef..a4301d88 100644 --- a/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/dbsearchengine2/preferenceswidget.cpp @@ -9,7 +9,7 @@ #include <kurlrequester.h> #include <tqtoolbutton.h> #include <klineedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <knuminput.h> #include "dbse2.h" @@ -30,7 +30,7 @@ KDB2PreferencesWidget::KDB2PreferencesWidget(TQWidget *parent, const char* name) standard(); -// connect(dbpw->browseTB_3,TQT_SIGNAL(clicked()),TQT_SLOT(browse1())); +// connect(dbpw->browseTB_3,TQ_SIGNAL(clicked()),TQ_SLOT(browse1())); emit restoreNow(); //Fill with actual params. diff --git a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp index 8d706b99..5dce4c5e 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/pa_factory.cpp @@ -33,7 +33,7 @@ #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> @@ -43,7 +43,7 @@ extern "C" { - KDE_EXPORT void *init_kbabeldict_poauxiliary() + TDE_EXPORT void *init_kbabeldict_poauxiliary() { return new PaFactory; } diff --git a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp index 815e025f..60f2f699 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/poauxiliary.cpp @@ -35,7 +35,7 @@ #include <tdecmdlineargs.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tqregexp.h> #include <tqtimer.h> @@ -64,7 +64,7 @@ PoAuxiliary::PoAuxiliary(TQObject *parent, const char *name) ignoreFuzzy=true; loadTimer = new TQTimer(this); - connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(loadAuxiliary())); + connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(loadAuxiliary())); msgidDict.setAutoDelete(true); } @@ -127,9 +127,9 @@ void PoAuxiliary::readSettings(TDEConfigBase *config) PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *parent) { prefWidget = new AuxiliaryPreferencesWidget(parent,"pocompendium_prefwidget"); - connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); - connect(prefWidget, TQT_SIGNAL(restoreSettings()) - , this, TQT_SLOT(restoreSettings())); + connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings())); + connect(prefWidget, TQ_SIGNAL(restoreSettings()) + , this, TQ_SLOT(restoreSettings())); restoreSettings(); @@ -182,7 +182,7 @@ bool PoAuxiliary::startSearch(const TQString& t, uint pluralForm, const SearchFi clearResults(); - kapp->processEvents(100); + tdeApp->processEvents(100); text.replace("\n",""); @@ -255,7 +255,7 @@ bool PoAuxiliary::startSearchInTranslation(const TQString& text) clearResults(); - kapp->processEvents(100); + tdeApp->processEvents(100); Entry *entry = msgstrDict[text]; if(entry) @@ -424,8 +424,8 @@ void PoAuxiliary::loadAuxiliary() } emit progressStarts(i18n("Loading PO auxiliary")); - connect(catalog, TQT_SIGNAL(signalProgress(int)) - , this, TQT_SIGNAL(progress(int))); + connect(catalog, TQ_SIGNAL(signalProgress(int)) + , this, TQ_SIGNAL(progress(int))); ConversionStatus stat = catalog->openURL(u); if( stat != OK && stat != RECOVERED_PARSE_ERROR) @@ -455,7 +455,7 @@ void PoAuxiliary::loadAuxiliary() if( (100*(i+1))%total < 100 ) { emit progress((100*(i+1))/total); - kapp->processEvents(100); + tdeApp->processEvents(100); } Entry *e = new Entry; @@ -476,8 +476,8 @@ void PoAuxiliary::loadAuxiliary() auxTranslator = catalog->lastTranslator(); } - disconnect(catalog, TQT_SIGNAL(signalProgress(int)) - , this, TQT_SIGNAL(progress(int))); + disconnect(catalog, TQ_SIGNAL(signalProgress(int)) + , this, TQ_SIGNAL(progress(int))); emit progressEnds(); diff --git a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp index 378b1830..ddf63616 100644 --- a/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/poauxiliary/preferenceswidget.cpp @@ -53,8 +53,8 @@ AuxiliaryPreferencesWidget::AuxiliaryPreferencesWidget(TQWidget *parent, const c layout->addWidget(prefWidget); - connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) - , this, TQT_SLOT(setChanged())); + connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&)) + , this, TQ_SLOT(setChanged())); } AuxiliaryPreferencesWidget::~AuxiliaryPreferencesWidget() diff --git a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp index 22598cbf..33bd2981 100644 --- a/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/compendiumdata.cpp @@ -77,12 +77,12 @@ bool CompendiumData::load(KURL url) emit progressStarts(i18n("Loading PO compendium")); - connect(_catalog, TQT_SIGNAL(signalProgress(int)), this, TQT_SIGNAL(progress(int))); + connect(_catalog, TQ_SIGNAL(signalProgress(int)), this, TQ_SIGNAL(progress(int))); ConversionStatus stat=_catalog->openURL(url); - disconnect(_catalog, TQT_SIGNAL(signalProgress(int)) - , this, TQT_SIGNAL(progress(int))); + disconnect(_catalog, TQ_SIGNAL(signalProgress(int)) + , this, TQ_SIGNAL(progress(int))); if( stat!= OK && stat != RECOVERED_PARSE_ERROR) @@ -109,7 +109,7 @@ bool CompendiumData::load(KURL url) if( (100*(i+1))%total < 100 ) { emit progress((100*(i+1))/total); - kapp->processEvents(100); + tdeApp->processEvents(100); } // FIXME: shoudl care about plural forms diff --git a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp index 936a5a5a..fff60355 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pc_factory.cpp @@ -33,7 +33,7 @@ #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> @@ -43,7 +43,7 @@ extern "C" { - KDE_EXPORT void *init_kbabeldict_pocompendium() + TDE_EXPORT void *init_kbabeldict_pocompendium() { return new PcFactory; } diff --git a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp index 9d1f6440..eab0231b 100644 --- a/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/pocompendium.cpp @@ -38,7 +38,7 @@ #include <kstaticdeleter.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/netaccess.h> #include <tqregexp.h> @@ -88,7 +88,7 @@ PoCompendium::PoCompendium(TQObject *parent, const char *name) loadTimer = new TQTimer(this); - connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotLoadCompendium())); + connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotLoadCompendium())); } PoCompendium::~PoCompendium() @@ -164,9 +164,9 @@ PrefWidget *PoCompendium::preferencesWidget(TQWidget *parent) { prefWidget = new CompendiumPreferencesWidget(parent,"pocompendium_prefwidget"); kdDebug(KBABEL_SEARCH) << "PreferencesWidget is " << prefWidget << endl; - connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); - connect(prefWidget, TQT_SIGNAL(restoreSettings()) - , this, TQT_SLOT(restoreSettings())); + connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings())); + connect(prefWidget, TQ_SIGNAL(restoreSettings()) + , this, TQ_SLOT(restoreSettings())); restoreSettings(); @@ -369,7 +369,7 @@ bool PoCompendium::searchWords(const TQString& searchStr, uint pluralForm, TQPtr emit progress( (50*checkCounter+1)/catalogInfo.total); } - kapp->processEvents(100); + tdeApp->processEvents(100); TQString origStr = data->catalog()->msgid(*it).first(); origStr = CompendiumData::simplify(origStr); @@ -537,7 +537,7 @@ bool PoCompendium::searchNGram(const TQString& searchStr, uint pluralForm, TQPtr continue; } - kapp->processEvents(100); + tdeApp->processEvents(100); TQString origStr = data->catalog()->msgid(i).first(); origStr = CompendiumData::simplify(origStr); @@ -828,7 +828,7 @@ void PoCompendium::slotLoadCompendium() } else { - connect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + connect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); } } else @@ -847,7 +847,7 @@ void PoCompendium::recheckData() { if(data) { - disconnect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + disconnect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); error = data->hasErrors(); errorMsg = data->errorMsg(); @@ -1153,14 +1153,14 @@ void PoCompendium::unregisterData() { if(data) { - disconnect(data, TQT_SIGNAL(progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - disconnect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - disconnect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + disconnect(data, TQ_SIGNAL(progressStarts(const TQString&)), this + , TQ_SIGNAL(progressStarts(const TQString&))); + disconnect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + disconnect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); if(data->active()) { - disconnect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(recheckData())); + disconnect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(recheckData())); } if(data->unregisterObject(this)) @@ -1171,7 +1171,7 @@ void PoCompendium::unregisterData() } else { - connect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(removeData())); + connect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(removeData())); } } @@ -1195,11 +1195,11 @@ void PoCompendium::registerData() emit progressStarts(i18n("Loading PO compendium")); } - connect(data, TQT_SIGNAL( + connect(data, TQ_SIGNAL( progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - connect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - connect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + , TQ_SIGNAL(progressStarts(const TQString&))); + connect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + connect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); } void PoCompendium::removeData() diff --git a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp index 4ecb2886..d152e3b1 100644 --- a/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/pocompendium/preferenceswidget.cpp @@ -53,36 +53,36 @@ CompendiumPreferencesWidget::CompendiumPreferencesWidget(TQWidget *parent, const prefWidget = new CompendiumPWidget(this); layout->addWidget(prefWidget); - connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->fuzzyBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->wholeBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); + connect(prefWidget->caseBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->fuzzyBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->wholeBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); - connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) - , this, TQT_SLOT(setChanged())); - - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(equalBtnToggled(bool))); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(ngramBtnToggled(bool))); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(isContainedBtnToggled(bool))); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(containsBtnToggled(bool))); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(hasWordBtnToggled(bool))); + connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&)) + , this, TQ_SLOT(setChanged())); + + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(equalBtnToggled(bool))); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(ngramBtnToggled(bool))); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(isContainedBtnToggled(bool))); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(containsBtnToggled(bool))); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(hasWordBtnToggled(bool))); TQString whatsthis=i18n("<qt><p><b>Parameters</b></p>" diff --git a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp index 6a522d4c..1ff113f6 100644 --- a/kbabel/kbabeldict/modules/tmx/pc_factory.cpp +++ b/kbabel/kbabeldict/modules/tmx/pc_factory.cpp @@ -33,7 +33,7 @@ #include <tdelocale.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <kdebug.h> @@ -43,7 +43,7 @@ extern "C" { - KDE_EXPORT void *init_kbabeldict_tmxcompendium() + TDE_EXPORT void *init_kbabeldict_tmxcompendium() { return new PcFactory; } diff --git a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp index 9b4cde15..a4ba2cb4 100644 --- a/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp +++ b/kbabel/kbabeldict/modules/tmx/preferenceswidget.cpp @@ -55,34 +55,34 @@ TmxCompendiumPreferencesWidget::TmxCompendiumPreferencesWidget(TQWidget *parent, prefWidget = new TmxCompendiumPWidget(this); layout->addWidget(prefWidget); - connect(prefWidget->caseBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); - connect(prefWidget->wholeBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(setChanged())); + connect(prefWidget->caseBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); + connect(prefWidget->wholeBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(setChanged())); - connect(prefWidget->urlInput->lineEdit(),TQT_SIGNAL(textChanged(const TQString&)) - , this, TQT_SLOT(setChanged())); - - connect(prefWidget->equalBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(equalBtnToggled(bool))); - connect(prefWidget->ngramBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(ngramBtnToggled(bool))); - connect(prefWidget->isContainedBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(isContainedBtnToggled(bool))); - connect(prefWidget->containsBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(containsBtnToggled(bool))); - connect(prefWidget->hasWordBtn, TQT_SIGNAL(toggled(bool)) - , this, TQT_SLOT(hasWordBtnToggled(bool))); + connect(prefWidget->urlInput->lineEdit(),TQ_SIGNAL(textChanged(const TQString&)) + , this, TQ_SLOT(setChanged())); + + connect(prefWidget->equalBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(equalBtnToggled(bool))); + connect(prefWidget->ngramBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(ngramBtnToggled(bool))); + connect(prefWidget->isContainedBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(isContainedBtnToggled(bool))); + connect(prefWidget->containsBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(containsBtnToggled(bool))); + connect(prefWidget->hasWordBtn, TQ_SIGNAL(toggled(bool)) + , this, TQ_SLOT(hasWordBtnToggled(bool))); TQString whatsthis=i18n("<qt><p><b>Parameters</b></p>" diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp index 6ce92e84..1f19a4cd 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendium.cpp @@ -38,7 +38,7 @@ #include <kstaticdeleter.h> #include <kdebug.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/netaccess.h> #include <tqtextstream.h> @@ -82,7 +82,7 @@ TmxCompendium::TmxCompendium(TQObject *parent, const char *name) loadTimer = new TQTimer(this); - connect(loadTimer,TQT_SIGNAL(timeout()),this,TQT_SLOT(slotLoadCompendium())); + connect(loadTimer,TQ_SIGNAL(timeout()),this,TQ_SLOT(slotLoadCompendium())); } TmxCompendium::~TmxCompendium() @@ -155,9 +155,9 @@ void TmxCompendium::readSettings(TDEConfigBase *config) PrefWidget *TmxCompendium::preferencesWidget(TQWidget *parent) { prefWidget = new TmxCompendiumPreferencesWidget(parent,"tmxcompendium_prefwidget"); - connect(prefWidget, TQT_SIGNAL(applySettings()), this, TQT_SLOT(applySettings())); - connect(prefWidget, TQT_SIGNAL(restoreSettings()) - , this, TQT_SLOT(restoreSettings())); + connect(prefWidget, TQ_SIGNAL(applySettings()), this, TQ_SLOT(applySettings())); + connect(prefWidget, TQ_SIGNAL(restoreSettings()) + , this, TQ_SLOT(restoreSettings())); restoreSettings(); @@ -337,7 +337,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea emit progress( (100*(checkCounter+1))/data->numberOfEntries()); } - kapp->processEvents(100); + tdeApp->processEvents(100); TQString origStr = data->msgid(*it); origStr = TmxCompendiumData::simplify(origStr); @@ -484,7 +484,7 @@ bool TmxCompendium::startSearch(const TQString& text, uint pluralForm, const Sea continue; } - kapp->processEvents(100); + tdeApp->processEvents(100); if(i >= data->numberOfEntries()) { @@ -718,7 +718,7 @@ void TmxCompendium::slotLoadCompendium() } else { - connect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + connect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); } } else @@ -737,7 +737,7 @@ void TmxCompendium::recheckData() { if(data) { - disconnect(data, TQT_SIGNAL(progressEnds()), this, TQT_SLOT(recheckData())); + disconnect(data, TQ_SIGNAL(progressEnds()), this, TQ_SLOT(recheckData())); error = data->hasErrors(); errorMsg = data->errorMsg(); @@ -915,14 +915,14 @@ void TmxCompendium::unregisterData() { if(data) { - disconnect(data, TQT_SIGNAL(progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - disconnect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - disconnect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + disconnect(data, TQ_SIGNAL(progressStarts(const TQString&)), this + , TQ_SIGNAL(progressStarts(const TQString&))); + disconnect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + disconnect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); if(data->active()) { - disconnect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(recheckData())); + disconnect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(recheckData())); } if(data->unregisterObject(this)) @@ -933,7 +933,7 @@ void TmxCompendium::unregisterData() } else { - connect(data,TQT_SIGNAL(progressEnds()),this,TQT_SLOT(removeData())); + connect(data,TQ_SIGNAL(progressEnds()),this,TQ_SLOT(removeData())); } } @@ -957,10 +957,10 @@ void TmxCompendium::registerData() emit progressStarts(i18n("Loading PO compendium")); } - connect(data, TQT_SIGNAL(progressStarts(const TQString&)), this - , TQT_SIGNAL(progressStarts(const TQString&))); - connect(data, TQT_SIGNAL(progressEnds()), this , TQT_SIGNAL(progressEnds())); - connect(data, TQT_SIGNAL(progress(int)), this , TQT_SIGNAL(progress(int))); + connect(data, TQ_SIGNAL(progressStarts(const TQString&)), this + , TQ_SIGNAL(progressStarts(const TQString&))); + connect(data, TQ_SIGNAL(progressEnds()), this , TQ_SIGNAL(progressEnds())); + connect(data, TQ_SIGNAL(progress(int)), this , TQ_SIGNAL(progress(int))); } void TmxCompendium::removeData() diff --git a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp index 17a9ec15..85902961 100644 --- a/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp +++ b/kbabel/kbabeldict/modules/tmx/tmxcompendiumdata.cpp @@ -146,7 +146,7 @@ bool TmxCompendiumData::load(const KURL& url, const TQString& language) if( (100*(i+1))%total < 100 ) { emit progress((100*(i+1))/total); - kapp->processEvents(100); + tdeApp->processEvents(100); } TQDomNodeList tuvTags = tuTags.item(i).toElement().elementsByTagName("tuv"); diff --git a/kbabel/kbabeldict/searchengine.h b/kbabel/kbabeldict/searchengine.h index c04640ce..729e0644 100644 --- a/kbabel/kbabeldict/searchengine.h +++ b/kbabel/kbabeldict/searchengine.h @@ -48,7 +48,7 @@ * Information, that is not available in a specific implementation of * the SearchEngine, should be left empty. */ -class KDE_EXPORT TranslationInfo +class TDE_EXPORT TranslationInfo { public: /** @@ -107,7 +107,7 @@ public: * plus additional information where it was found, * the date and time of the last change, the translator, etc. */ -class KDE_EXPORT SearchResult +class TDE_EXPORT SearchResult { public: SearchResult(); @@ -162,7 +162,7 @@ public: /** * */ -class KDE_EXPORT SearchFilter +class TDE_EXPORT SearchFilter { public: SearchFilter() : @@ -241,7 +241,7 @@ private: * necessary function. The widget should not be bigger than 400x400. * If you need more space, you maybe want to use a tabbed widget. */ -class KDE_EXPORT PrefWidget : public TQWidget +class TDE_EXPORT PrefWidget : public TQWidget { TQ_OBJECT @@ -266,7 +266,7 @@ public slots: }; -class KDE_EXPORT SearchEngine : public TQObject +class TDE_EXPORT SearchEngine : public TQObject { TQ_OBJECT diff --git a/kbugbuster/backend/bugcache.cpp b/kbugbuster/backend/bugcache.cpp index 9daa5e3d..e967641c 100644 --- a/kbugbuster/backend/bugcache.cpp +++ b/kbugbuster/backend/bugcache.cpp @@ -3,8 +3,8 @@ #include <tqstringlist.h> #include <tqfile.h> -#include <ksimpleconfig.h> -#include <kstandarddirs.h> +#include <tdesimpleconfig.h> +#include <tdestandarddirs.h> #include <kurl.h> #include <kdebug.h> @@ -35,8 +35,8 @@ void BugCache::init() mCachePackagesFileName = locateLocal( "appdata", mId + "-packages.cache" ); mCacheBugsFileName = locateLocal( "appdata", mId + "-bugs.cache" ); - m_cachePackages = new KSimpleConfig( mCachePackagesFileName ); - m_cacheBugs = new KSimpleConfig( mCacheBugsFileName ); + m_cachePackages = new TDESimpleConfig( mCachePackagesFileName ); + m_cacheBugs = new TDESimpleConfig( mCacheBugsFileName ); } void BugCache::savePackageList( const Package::List &pkgs ) @@ -268,7 +268,7 @@ void BugCache::clear() init(); } -void BugCache::writePerson( KSimpleConfig *file, const TQString &key, +void BugCache::writePerson( TDESimpleConfig *file, const TQString &key, const Person &p ) { TQStringList values; @@ -277,7 +277,7 @@ void BugCache::writePerson( KSimpleConfig *file, const TQString &key, file->writeEntry( key, values ); } -struct Person BugCache::readPerson( KSimpleConfig *file, const TQString &key ) +struct Person BugCache::readPerson( TDESimpleConfig *file, const TQString &key ) { struct Person p; TQStringList values = file->readListEntry(key); diff --git a/kbugbuster/backend/bugcache.h b/kbugbuster/backend/bugcache.h index bef22493..bb4753e1 100644 --- a/kbugbuster/backend/bugcache.h +++ b/kbugbuster/backend/bugcache.h @@ -1,7 +1,7 @@ #ifndef BUGCACHE_H #define BUGCACHE_H -class KSimpleConfig; +class TDESimpleConfig; #include "package.h" #include "bug.h" @@ -31,14 +31,14 @@ class BugCache private: void init(); - void writePerson( KSimpleConfig *file, const TQString &key, + void writePerson( TDESimpleConfig *file, const TQString &key, const Person &p ); - struct Person readPerson (KSimpleConfig *file, const TQString &key ); + struct Person readPerson (TDESimpleConfig *file, const TQString &key ); TQString mId; - KSimpleConfig *m_cachePackages; - KSimpleConfig *m_cacheBugs; + TDESimpleConfig *m_cachePackages; + TDESimpleConfig *m_cacheBugs; TQString mCachePackagesFileName; TQString mCacheBugsFileName; diff --git a/kbugbuster/backend/bugjob.cpp b/kbugbuster/backend/bugjob.cpp index 3531fc5f..faf1d149 100644 --- a/kbugbuster/backend/bugjob.cpp +++ b/kbugbuster/backend/bugjob.cpp @@ -30,14 +30,14 @@ void BugJob::start( const KURL &url ) TDEIO::Job *job = TDEIO::get( url, true /*always 'reload=true', we have our own cache*/, false ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), - this, TQT_SLOT( ioResult( TDEIO::Job * ) ) ); - connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), - this, TQT_SLOT( ioData( TDEIO::Job *, const TQByteArray & ) ) ); - connect( job, TQT_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), - this, TQT_SLOT( ioInfoMessage( TDEIO::Job *, const TQString & ) ) ); - connect( job, TQT_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), - this, TQT_SLOT( ioInfoPercent( TDEIO::Job *, unsigned long ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), + this, TQ_SLOT( ioResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ), + this, TQ_SLOT( ioData( TDEIO::Job *, const TQByteArray & ) ) ); + connect( job, TQ_SIGNAL( infoMessage( TDEIO::Job *, const TQString & ) ), + this, TQ_SLOT( ioInfoMessage( TDEIO::Job *, const TQString & ) ) ); + connect( job, TQ_SIGNAL( percent( TDEIO::Job *, unsigned long ) ), + this, TQ_SLOT( ioInfoPercent( TDEIO::Job *, unsigned long ) ) ); } void BugJob::ioResult( TDEIO::Job *job ) diff --git a/kbugbuster/backend/bugserver.cpp b/kbugbuster/backend/bugserver.cpp index f8ace6e6..eca7716b 100644 --- a/kbugbuster/backend/bugserver.cpp +++ b/kbugbuster/backend/bugserver.cpp @@ -30,8 +30,8 @@ #include "bugserverconfig.h" #include "htmlparser.h" -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <kdebug.h> BugServer::BugServer() @@ -50,7 +50,7 @@ void BugServer::init() mCache = new BugCache( identifier() ); TQString commandsFile = locateLocal( "appdata", identifier() + "commands" ); - mCommandsFile = new KSimpleConfig( commandsFile ); + mCommandsFile = new TDESimpleConfig( commandsFile ); TQString bugzilla = mServerConfig.bugzillaVersion(); @@ -258,8 +258,8 @@ void BugServer::sendCommands( MailSender *mailer, const TQString &senderName, // implement message queueing for smtp MailSender *directMailer = mailer->clone(); #if 0 - connect( directMailer, TQT_SIGNAL( status( const TQString & ) ), - this, TQT_SIGNAL( infoMessage( const TQString & ) ) ); + connect( directMailer, TQ_SIGNAL( status( const TQString & ) ), + this, TQ_SIGNAL( infoMessage( const TQString & ) ) ); #endif if (!directMailer->send( senderName, senderEmail, cmd->mailAddress(), cmd->bug().title().prepend( "Re: " ), diff --git a/kbugbuster/backend/bugserver.h b/kbugbuster/backend/bugserver.h index 794615c8..10e7ca8e 100644 --- a/kbugbuster/backend/bugserver.h +++ b/kbugbuster/backend/bugserver.h @@ -142,7 +142,7 @@ class BugServer typedef TQMap< TQString, TQPtrList<BugCommand> > CommandsMap; CommandsMap mCommands; - KSimpleConfig *mCommandsFile; + TDESimpleConfig *mCommandsFile; }; #endif diff --git a/kbugbuster/backend/bugsystem.cpp b/kbugbuster/backend/bugsystem.cpp index f5bd66bd..1a6524fb 100644 --- a/kbugbuster/backend/bugsystem.cpp +++ b/kbugbuster/backend/bugsystem.cpp @@ -10,8 +10,8 @@ #include <kdebug.h> #include <tdelocale.h> #include <tdeemailsettings.h> -#include <kstandarddirs.h> -#include <ksimpleconfig.h> +#include <tdestandarddirs.h> +#include <tdesimpleconfig.h> #include <tdeconfig.h> #include "packageimpl.h" @@ -80,12 +80,12 @@ void BugSystem::retrievePackageList() emit packageListLoading(); PackageListJob *job = new PackageListJob( mServer ); - connect( job, TQT_SIGNAL( packageListAvailable( const Package::List & ) ), - this, TQT_SIGNAL( packageListAvailable( const Package::List & ) ) ); - connect( job, TQT_SIGNAL( packageListAvailable( const Package::List & ) ), - this, TQT_SLOT( setPackageList( const Package::List & ) ) ); - connect( job, TQT_SIGNAL( error( const TQString & ) ), - this, TQT_SIGNAL( loadingError( const TQString & ) ) ); + connect( job, TQ_SIGNAL( packageListAvailable( const Package::List & ) ), + this, TQ_SIGNAL( packageListAvailable( const Package::List & ) ) ); + connect( job, TQ_SIGNAL( packageListAvailable( const Package::List & ) ), + this, TQ_SLOT( setPackageList( const Package::List & ) ) ); + connect( job, TQ_SIGNAL( error( const TQString & ) ), + this, TQ_SIGNAL( loadingError( const TQString & ) ) ); connectJob( job ); registerJob( job ); @@ -120,12 +120,12 @@ void BugSystem::retrieveBugList( const Package &pkg, const TQString &component ) emit bugListLoading( pkg, component ); BugListJob *job = new BugListJob( mServer ); - connect( job, TQT_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ), - this, TQT_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ) ); - connect( job, TQT_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ), - this, TQT_SLOT( setBugList( const Package &, const TQString &, const Bug::List & ) ) ); - connect( job, TQT_SIGNAL( error( const TQString & ) ), - this, TQT_SIGNAL( loadingError( const TQString & ) ) ); + connect( job, TQ_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ), + this, TQ_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ) ); + connect( job, TQ_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ), + this, TQ_SLOT( setBugList( const Package &, const TQString &, const Bug::List & ) ) ); + connect( job, TQ_SIGNAL( error( const TQString & ) ), + this, TQ_SIGNAL( loadingError( const TQString & ) ) ); connectJob( job ); registerJob( job ); @@ -152,10 +152,10 @@ void BugSystem::retrieveMyBugsList() BugMyBugsJob *job = new BugMyBugsJob( mServer ); - connect( job, TQT_SIGNAL( bugListAvailable( const TQString &, const Bug::List & ) ), - this, TQT_SIGNAL( bugListAvailable( const TQString &, const Bug::List & ) ) ); - connect( job, TQT_SIGNAL( error( const TQString & ) ), - this, TQT_SIGNAL( loadingError( const TQString & ) ) ); + connect( job, TQ_SIGNAL( bugListAvailable( const TQString &, const Bug::List & ) ), + this, TQ_SIGNAL( bugListAvailable( const TQString &, const Bug::List & ) ) ); + connect( job, TQ_SIGNAL( error( const TQString & ) ), + this, TQ_SIGNAL( loadingError( const TQString & ) ) ); connectJob( job ); registerJob( job ); @@ -184,12 +184,12 @@ void BugSystem::retrieveBugDetails( const Bug &bug ) emit bugDetailsLoading( bug ); BugDetailsJob *job = new BugDetailsJob( mServer ); - connect( job, TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), - this, TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ) ); - connect( job, TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), - this, TQT_SLOT( setBugDetails( const Bug &, const BugDetails & ) ) ); - connect( job, TQT_SIGNAL( error( const TQString & ) ), - this, TQT_SIGNAL( bugDetailsLoadingError() ) ); + connect( job, TQ_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), + this, TQ_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ) ); + connect( job, TQ_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), + this, TQ_SLOT( setBugDetails( const Bug &, const BugDetails & ) ) ); + connect( job, TQ_SIGNAL( error( const TQString & ) ), + this, TQ_SIGNAL( bugDetailsLoadingError() ) ); connectJob( job ); registerJob( job ); @@ -201,12 +201,12 @@ void BugSystem::retrieveBugDetails( const Bug &bug ) void BugSystem::connectJob( BugJob *job ) { - connect( job, TQT_SIGNAL( infoMessage( const TQString & ) ), - this, TQT_SIGNAL( infoMessage( const TQString & ) ) ); - connect( job, TQT_SIGNAL( infoPercent( unsigned long ) ), - this, TQT_SIGNAL( infoPercent( unsigned long ) ) ); - connect( job, TQT_SIGNAL( jobEnded( BugJob * ) ), - TQT_SLOT( unregisterJob( BugJob * ) ) ); + connect( job, TQ_SIGNAL( infoMessage( const TQString & ) ), + this, TQ_SIGNAL( infoMessage( const TQString & ) ) ); + connect( job, TQ_SIGNAL( infoPercent( unsigned long ) ), + this, TQ_SIGNAL( infoPercent( unsigned long ) ) ); + connect( job, TQ_SIGNAL( jobEnded( BugJob * ) ), + TQ_SLOT( unregisterJob( BugJob * ) ) ); } void BugSystem::setPackageList( const Package::List &pkgs ) @@ -290,8 +290,8 @@ void BugSystem::sendCommands() // ### connect to signals MailSender *mailer = new MailSender( client, smtpServer ); - connect( mailer, TQT_SIGNAL( status( const TQString & ) ), - TQT_SIGNAL( infoMessage( const TQString & ) ) ); + connect( mailer, TQ_SIGNAL( status( const TQString & ) ), + TQ_SIGNAL( infoMessage( const TQString & ) ) ); mServer->sendCommands( mailer, senderName, senderEmail, sendBCC, recipient ); } diff --git a/kbugbuster/backend/mailsender.cpp b/kbugbuster/backend/mailsender.cpp index 8420cbf9..f8322e0c 100644 --- a/kbugbuster/backend/mailsender.cpp +++ b/kbugbuster/backend/mailsender.cpp @@ -8,13 +8,13 @@ #include <tqtimer.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdebug.h> #include <tdemessagebox.h> #include <kurl.h> #include <tdeapplication.h> #include <dcopclient.h> -#include <kprocess.h> +#include <tdeprocess.h> #include "mailsender.h" #include "smtp.h" @@ -78,7 +78,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T if (!fd) { kdError() << "Unable to open a pipe to " << command << endl; - TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteLater() ) ); return false; } @@ -101,15 +101,15 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T } else if ( m_client == KMail ) { kdDebug() << "Sending per KMail" << endl; - if (!kapp->dcopClient()->isApplicationRegistered("kmail")) { + if (!tdeApp->dcopClient()->isApplicationRegistered("kmail")) { KMessageBox::error(0,i18n("No running instance of KMail found.")); - TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteLater() ) ); return false; } emit status( i18n( "Passing mail to TDE email program..." ) ); if (!kMailOpenComposer(to,"", (bcc ? from : ""), subject,body,0,KURL())) { - TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteLater() ) ); return false; } } else if ( m_client == Direct ) { @@ -128,12 +128,12 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T TQString::fromLatin1( "\n\n" ) + body; Smtp *smtp = new Smtp( fromEmail, recipients, message, m_smtpServer ); - connect( smtp, TQT_SIGNAL( status( const TQString & ) ), - this, TQT_SIGNAL( status( const TQString & ) ) ); - connect( smtp, TQT_SIGNAL( success() ), - this, TQT_SLOT( smtpSuccess() ) ); - connect( smtp, TQT_SIGNAL( error( const TQString &, const TQString & ) ), - this, TQT_SLOT( smtpError( const TQString &, const TQString & ) ) ); + connect( smtp, TQ_SIGNAL( status( const TQString & ) ), + this, TQ_SIGNAL( status( const TQString & ) ) ); + connect( smtp, TQ_SIGNAL( success() ), + this, TQ_SLOT( smtpSuccess() ) ); + connect( smtp, TQ_SIGNAL( error( const TQString &, const TQString & ) ), + this, TQ_SLOT( smtpError( const TQString &, const TQString & ) ) ); smtp->insertChild( this ); // die when smtp dies } else { @@ -143,7 +143,7 @@ bool MailSender::send(const TQString &fromName,const TQString &fromEmail,const T if (m_client != Direct) { emit finished(); - TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteLater() ) ); } return true; @@ -170,13 +170,13 @@ void MailSender::smtpError(const TQString &_command, const TQString &_response) smtp->removeChild( this ); delete smtp; - KMessageBox::error( TQT_TQWIDGET(tqApp->activeWindow()), + KMessageBox::error( tqApp->activeWindow(), i18n( "Error during SMTP transfer.\n" "command: %1\n" "response: %2" ).arg( command ).arg( response ) ); emit finished(); - TQTimer::singleShot( 0, this, TQT_SLOT( deleteLater() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( deleteLater() ) ); } int MailSender::kMailOpenComposer(const TQString& arg0,const TQString& arg1, @@ -195,7 +195,7 @@ int MailSender::kMailOpenComposer(const TQString& arg0,const TQString& arg1, arg << arg4; arg << arg5; arg << arg6; - if (kapp->dcopClient()->call("kmail","KMailIface","openComposer(TQString,TQString,TQString,TQString,TQString,int,KURL)", data, replyType, replyData ) ) { + if (tdeApp->dcopClient()->call("kmail","KMailIface","openComposer(TQString,TQString,TQString,TQString,TQString,int,KURL)", data, replyType, replyData ) ) { if ( replyType == "int" ) { TQDataStream _reply_stream( replyData, IO_ReadOnly ); _reply_stream >> result; diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp index 2b5f58e9..5e5bc9da 100644 --- a/kbugbuster/backend/smtp.cpp +++ b/kbugbuster/backend/smtp.cpp @@ -23,12 +23,12 @@ Smtp::Smtp( const TQString &from, const TQStringList &to, { skipReadResponse = false; mSocket = new TQSocket( this ); - connect ( mSocket, TQT_SIGNAL( readyRead() ), - this, TQT_SLOT( readyRead() ) ); - connect ( mSocket, TQT_SIGNAL( connected() ), - this, TQT_SLOT( connected() ) ); - connect ( mSocket, TQT_SIGNAL( error(int) ), - this, TQT_SLOT( socketError(int) ) ); + connect ( mSocket, TQ_SIGNAL( readyRead() ), + this, TQ_SLOT( readyRead() ) ); + connect ( mSocket, TQ_SIGNAL( connected() ), + this, TQ_SLOT( connected() ) ); + connect ( mSocket, TQ_SIGNAL( error(int) ), + this, TQ_SLOT( socketError(int) ) ); message = aMessage; @@ -98,7 +98,7 @@ void Smtp::socketError(int errorCode) default: responseLine = i18n( "Internal error, unrecognized error." ); } - TQTimer::singleShot( 0, this, TQT_SLOT(emitError()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitError()) ); } void Smtp::emitError() { @@ -147,7 +147,7 @@ void Smtp::readyRead() *t << message << seperator << ".\r\n"; state = smtpSuccess; } else if ( state == smtpSuccess && responseLine[0] == '2' ) { - TQTimer::singleShot( 0, this, TQT_SIGNAL(success()) ); + TQTimer::singleShot( 0, this, TQ_SIGNAL(success()) ); } else if ( state == smtpQuit && responseLine[0] == '2' ) { command = "QUIT"; *t << "QUIT\r\n"; @@ -157,7 +157,7 @@ void Smtp::readyRead() } else if ( state == smtpClose ) { // we ignore it } else { // error occurred - TQTimer::singleShot( 0, this, TQT_SLOT(emitError()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(emitError()) ); state = smtpClose; } @@ -168,7 +168,7 @@ void Smtp::readyRead() t = 0; delete mSocket; mSocket = 0; - TQTimer::singleShot( 0, this, TQT_SLOT(deleteMe()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(deleteMe()) ); } } diff --git a/kbugbuster/gui/centralwidget.cpp b/kbugbuster/gui/centralwidget.cpp index 263c9f86..3cd1df78 100644 --- a/kbugbuster/gui/centralwidget.cpp +++ b/kbugbuster/gui/centralwidget.cpp @@ -71,51 +71,51 @@ CentralWidget::CentralWidget( const TQCString &initialPackage, TQSizePolicy::Minimum ) ); m_horSplitter->setResizeMode( m_searchPane, TQSplitter::FollowSizeHint ); - connect( m_listPane, TQT_SIGNAL( resetProgressBar() ), - TQT_SIGNAL( resetProgressBar() ) ); - connect( m_bugPane, TQT_SIGNAL( resetProgressBar() ), - TQT_SIGNAL( resetProgressBar() ) ); + connect( m_listPane, TQ_SIGNAL( resetProgressBar() ), + TQ_SIGNAL( resetProgressBar() ) ); + connect( m_bugPane, TQ_SIGNAL( resetProgressBar() ), + TQ_SIGNAL( resetProgressBar() ) ); // Start the proper jobs for loading the package lists connect( BugSystem::self(), - TQT_SIGNAL( packageListAvailable( const Package::List & ) ), - TQT_SLOT( updatePackageList( const Package::List & ) ) ); + TQ_SIGNAL( packageListAvailable( const Package::List & ) ), + TQ_SLOT( updatePackageList( const Package::List & ) ) ); connect( BugSystem::self(), - TQT_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ), - TQT_SLOT( updateBugList( const Package &, const TQString &, const Bug::List & ) ) ); + TQ_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ), + TQ_SLOT( updateBugList( const Package &, const TQString &, const Bug::List & ) ) ); connect( BugSystem::self(), - TQT_SIGNAL( bugListAvailable( const TQString &, const Bug::List & ) ), - TQT_SLOT( updateBugList( const TQString &, const Bug::List & ) ) ); + TQ_SIGNAL( bugListAvailable( const TQString &, const Bug::List & ) ), + TQ_SLOT( updateBugList( const TQString &, const Bug::List & ) ) ); connect( BugSystem::self(), - TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), - TQT_SLOT( updateBugDetails( const Bug &, const BugDetails & ) ) ); + TQ_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), + TQ_SLOT( updateBugDetails( const Bug &, const BugDetails & ) ) ); - connect( BugSystem::self(), TQT_SIGNAL( loadingError( const TQString & ) ), - TQT_SLOT( showLoadingError( const TQString & ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( loadingError( const TQString & ) ), + TQ_SLOT( showLoadingError( const TQString & ) ) ); - connect( m_bugPane, TQT_SIGNAL( signalCloseBug() ), TQT_SLOT( closeBug() ) ); - connect( m_bugPane, TQT_SIGNAL( signalCloseBugSilently() ), TQT_SLOT( closeBugSilently() ) ); - connect( m_bugPane, TQT_SIGNAL( signalReopenBug() ), TQT_SLOT( reopenBug() ) ); - connect( m_bugPane, TQT_SIGNAL( signalReassignBug() ), TQT_SLOT( reassignBug() ) ); - connect( m_bugPane, TQT_SIGNAL( signalTitleBug() ), TQT_SLOT( titleBug() ) ); - connect( m_bugPane, TQT_SIGNAL( signalSeverityBug() ), TQT_SLOT( severityBug() ) ); - connect( m_bugPane, TQT_SIGNAL( signalReplyBug() ), TQT_SLOT( replyBug() ) ); - connect( m_bugPane, TQT_SIGNAL( signalReplyPrivateBug() ), TQT_SLOT( replyPrivateBug() ) ); + connect( m_bugPane, TQ_SIGNAL( signalCloseBug() ), TQ_SLOT( closeBug() ) ); + connect( m_bugPane, TQ_SIGNAL( signalCloseBugSilently() ), TQ_SLOT( closeBugSilently() ) ); + connect( m_bugPane, TQ_SIGNAL( signalReopenBug() ), TQ_SLOT( reopenBug() ) ); + connect( m_bugPane, TQ_SIGNAL( signalReassignBug() ), TQ_SLOT( reassignBug() ) ); + connect( m_bugPane, TQ_SIGNAL( signalTitleBug() ), TQ_SLOT( titleBug() ) ); + connect( m_bugPane, TQ_SIGNAL( signalSeverityBug() ), TQ_SLOT( severityBug() ) ); + connect( m_bugPane, TQ_SIGNAL( signalReplyBug() ), TQ_SLOT( replyBug() ) ); + connect( m_bugPane, TQ_SIGNAL( signalReplyPrivateBug() ), TQ_SLOT( replyPrivateBug() ) ); - connect( m_bugPane, TQT_SIGNAL( signalClearCommand() ), TQT_SLOT( clearCommand() ) ); + connect( m_bugPane, TQ_SIGNAL( signalClearCommand() ), TQ_SLOT( clearCommand() ) ); // Add the selection slots for the listviews connect( m_searchPane->m_searchPackages, - TQT_SIGNAL( activated( const TQString & ) ), - TQT_SLOT( slotRetrieveBugList( const TQString & ) ) ); + TQ_SIGNAL( activated( const TQString & ) ), + TQ_SLOT( slotRetrieveBugList( const TQString & ) ) ); - connect( m_listPane, TQT_SIGNAL( executed( const Bug & ) ), - TQT_SLOT( slotRetrieveBugDetails( const Bug & ) ) ); - connect( m_listPane, TQT_SIGNAL( currentChanged( const Bug & ) ), - TQT_SLOT( slotSetActiveBug( const Bug & ) ) ); + connect( m_listPane, TQ_SIGNAL( executed( const Bug & ) ), + TQ_SLOT( slotRetrieveBugDetails( const Bug & ) ) ); + connect( m_listPane, TQ_SIGNAL( currentChanged( const Bug & ) ), + TQ_SLOT( slotSetActiveBug( const Bug & ) ) ); - connect( m_listPane, TQT_SIGNAL( searchPackage() ), TQT_SIGNAL( searchPackage() ) ); - connect( m_bugPane, TQT_SIGNAL( searchBugNumber() ), TQT_SIGNAL( searchBugNumber() ) ); + connect( m_listPane, TQ_SIGNAL( searchPackage() ), TQ_SIGNAL( searchPackage() ) ); + connect( m_bugPane, TQ_SIGNAL( searchBugNumber() ), TQ_SIGNAL( searchBugNumber() ) ); m_bLoadingAllBugs = false; diff --git a/kbugbuster/gui/cwbugdetails.cpp b/kbugbuster/gui/cwbugdetails.cpp index 252ae348..93486c63 100644 --- a/kbugbuster/gui/cwbugdetails.cpp +++ b/kbugbuster/gui/cwbugdetails.cpp @@ -41,8 +41,8 @@ CWBugDetails::CWBugDetails( TQWidget *parent , const char * name ) TQBoxLayout *topLayout = new TQVBoxLayout( this ); m_bugDesc = new TDEHTMLPart( this, "m_bugDesc" ); - connect( m_bugDesc->browserExtension(), TQT_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), - this, TQT_SLOT( handleOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); + connect( m_bugDesc->browserExtension(), TQ_SIGNAL( openURLRequest( const KURL &, const KParts::URLArgs & ) ), + this, TQ_SLOT( handleOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) ); topLayout->addWidget( m_bugDesc->view() ); } diff --git a/kbugbuster/gui/cwbugdetailscontainer.cpp b/kbugbuster/gui/cwbugdetailscontainer.cpp index 188ec9e9..ba28d52e 100644 --- a/kbugbuster/gui/cwbugdetailscontainer.cpp +++ b/kbugbuster/gui/cwbugdetailscontainer.cpp @@ -61,7 +61,7 @@ CWBugDetailsContainer::CWBugDetailsContainer( TQWidget *parent , const char * na // Fill WidgetStack in Bug Details pane m_bugLoading = new CWLoadingWidget( CWLoadingWidget::BottomFrame, m_bugStack ); - connect( m_bugLoading, TQT_SIGNAL( clicked() ), TQT_SIGNAL( searchBugNumber() ) ); + connect( m_bugLoading, TQ_SIGNAL( clicked() ), TQ_SIGNAL( searchBugNumber() ) ); m_bugStack->addWidget( m_bugDetails, 0 ); m_bugStack->addWidget( m_bugLoading, 1 ); @@ -76,25 +76,25 @@ CWBugDetailsContainer::CWBugDetailsContainer( TQWidget *parent , const char * na CWBugDetailsContainer_BaseLayout->setSpacing( KDialog::spacingHint() ); CWBugDetailsContainer_BaseLayout->setMargin( KDialog::marginHint() ); - connect( m_bugCloseBtn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( signalCloseBug() ) ); - connect( m_bugCloseSilentlyBtn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( signalCloseBugSilently() ) ); - connect( m_bugReopenBtn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( signalReopenBug() ) ); - connect( m_bugReassignBtn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( signalReassignBug() ) ); - connect( m_bugTitleBtn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( signalTitleBug() ) ); - connect( m_bugSeverityBtn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( signalSeverityBug() ) ); - connect( m_bugReplyBtn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( signalReplyBug() ) ); - connect( m_bugReplyPrivBtn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( signalReplyPrivateBug() ) ); - - connect( m_cmdClearBtn, TQT_SIGNAL( clicked() ), TQT_SIGNAL( signalClearCommand() ) ); - - connect( BugSystem::self(), TQT_SIGNAL( bugDetailsLoading( const Bug & ) ), - TQT_SLOT( setLoading( const Bug & ) ) ); - connect( BugSystem::self(), TQT_SIGNAL( bugDetailsCacheMiss( const Bug & ) ), - TQT_SLOT( setCacheMiss( const Bug & ) ) ); - connect( BugSystem::self(), TQT_SIGNAL( commandQueued( BugCommand * ) ), - TQT_SLOT( commandQueued( BugCommand * ) ) ); - connect( BugSystem::self(), TQT_SIGNAL( commandCanceled( const TQString & ) ), - TQT_SLOT( clearCommand( const TQString & ) ) ); + connect( m_bugCloseBtn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( signalCloseBug() ) ); + connect( m_bugCloseSilentlyBtn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( signalCloseBugSilently() ) ); + connect( m_bugReopenBtn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( signalReopenBug() ) ); + connect( m_bugReassignBtn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( signalReassignBug() ) ); + connect( m_bugTitleBtn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( signalTitleBug() ) ); + connect( m_bugSeverityBtn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( signalSeverityBug() ) ); + connect( m_bugReplyBtn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( signalReplyBug() ) ); + connect( m_bugReplyPrivBtn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( signalReplyPrivateBug() ) ); + + connect( m_cmdClearBtn, TQ_SIGNAL( clicked() ), TQ_SIGNAL( signalClearCommand() ) ); + + connect( BugSystem::self(), TQ_SIGNAL( bugDetailsLoading( const Bug & ) ), + TQ_SLOT( setLoading( const Bug & ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( bugDetailsCacheMiss( const Bug & ) ), + TQ_SLOT( setCacheMiss( const Bug & ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( commandQueued( BugCommand * ) ), + TQ_SLOT( commandQueued( BugCommand * ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( commandCanceled( const TQString & ) ), + TQ_SLOT( clearCommand( const TQString & ) ) ); } CWBugDetailsContainer::~CWBugDetailsContainer() diff --git a/kbugbuster/gui/cwbuglistcontainer.cpp b/kbugbuster/gui/cwbuglistcontainer.cpp index 2eeadee3..a4607581 100644 --- a/kbugbuster/gui/cwbuglistcontainer.cpp +++ b/kbugbuster/gui/cwbuglistcontainer.cpp @@ -79,35 +79,35 @@ CWBugListContainer::CWBugListContainer( TQWidget *parent , const char * name ) m_listBugs->restoreLayout( KBBPrefs::instance()->config(), "BugListLayout" ); - connect( m_listBugs, TQT_SIGNAL( executed( TQListViewItem * ) ), - TQT_SLOT( execute( TQListViewItem * ) ) ); - connect( m_listBugs, TQT_SIGNAL( returnPressed( TQListViewItem * ) ), - TQT_SLOT( execute( TQListViewItem * ) ) ); - connect( m_listBugs, TQT_SIGNAL( currentChanged( TQListViewItem * ) ), - TQT_SLOT( changeCurrent( TQListViewItem * ) ) ); + connect( m_listBugs, TQ_SIGNAL( executed( TQListViewItem * ) ), + TQ_SLOT( execute( TQListViewItem * ) ) ); + connect( m_listBugs, TQ_SIGNAL( returnPressed( TQListViewItem * ) ), + TQ_SLOT( execute( TQListViewItem * ) ) ); + connect( m_listBugs, TQ_SIGNAL( currentChanged( TQListViewItem * ) ), + TQ_SLOT( changeCurrent( TQListViewItem * ) ) ); // Fill WidgetStack in Outstanding Bugs pane m_listLoading = new CWLoadingWidget( CWLoadingWidget::TopFrame, m_listStack ); - connect( m_listLoading, TQT_SIGNAL( clicked() ), TQT_SIGNAL( searchPackage() ) ); + connect( m_listLoading, TQ_SIGNAL( clicked() ), TQ_SIGNAL( searchPackage() ) ); m_listStack->addWidget( m_listBugs, 0 ); m_listStack->addWidget( m_listLoading, 1 ); setNoList(); - connect( BugSystem::self(), TQT_SIGNAL( bugListLoading( const Package &, const TQString & ) ), - TQT_SLOT( setLoading( const Package &, const TQString & ) ) ); - connect( BugSystem::self(), TQT_SIGNAL( bugListLoading( const TQString & ) ), - TQT_SLOT( setLoading( const TQString & ) ) ); - connect( BugSystem::self(), TQT_SIGNAL( bugListCacheMiss( const Package & ) ), - TQT_SLOT( setCacheMiss( const Package & ) ) ); - connect( BugSystem::self(), TQT_SIGNAL( bugListCacheMiss( const TQString & ) ), - TQT_SLOT( setCacheMiss( const TQString & ) ) ); - connect( BugSystem::self(), TQT_SIGNAL( commandQueued( BugCommand * ) ), - TQT_SLOT( markBugCommand( BugCommand * ) ) ); - connect( BugSystem::self(), TQT_SIGNAL( commandCanceled( const TQString & ) ), - TQT_SLOT( clearCommand( const TQString & ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( bugListLoading( const Package &, const TQString & ) ), + TQ_SLOT( setLoading( const Package &, const TQString & ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( bugListLoading( const TQString & ) ), + TQ_SLOT( setLoading( const TQString & ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( bugListCacheMiss( const Package & ) ), + TQ_SLOT( setCacheMiss( const Package & ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( bugListCacheMiss( const TQString & ) ), + TQ_SLOT( setCacheMiss( const TQString & ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( commandQueued( BugCommand * ) ), + TQ_SLOT( markBugCommand( BugCommand * ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( commandCanceled( const TQString & ) ), + TQ_SLOT( clearCommand( const TQString & ) ) ); } CWBugListContainer::~CWBugListContainer() @@ -261,9 +261,9 @@ void CWBugListContainer::searchBugByTitle( int options, const TQString& pattern m_find = new KFind( pattern, options, this ); // Connect signals to code which handles highlighting // of found text. - connect(m_find, TQT_SIGNAL( highlight( const TQString &, int, int ) ), - this, TQT_SLOT( searchHighlight( const TQString &, int, int ) ) ); - connect(m_find, TQT_SIGNAL( findNext() ), this, TQT_SLOT( slotFindNext() ) ); + connect(m_find, TQ_SIGNAL( highlight( const TQString &, int, int ) ), + this, TQ_SLOT( searchHighlight( const TQString &, int, int ) ) ); + connect(m_find, TQ_SIGNAL( findNext() ), this, TQ_SLOT( slotFindNext() ) ); m_findItem = (BugLVI *)m_listBugs->firstChild(); if ( options & KFindDialog::FromCursor && m_listBugs->currentItem() ) diff --git a/kbugbuster/gui/cwloadingwidget.cpp b/kbugbuster/gui/cwloadingwidget.cpp index 9962ec4a..b4f4c026 100644 --- a/kbugbuster/gui/cwloadingwidget.cpp +++ b/kbugbuster/gui/cwloadingwidget.cpp @@ -21,7 +21,7 @@ #include <kpixmap.h> #include <kpixmapeffect.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <tdeglobalsettings.h> diff --git a/kbugbuster/gui/cwsearchwidget.cpp b/kbugbuster/gui/cwsearchwidget.cpp index 3ac606ec..fff33706 100644 --- a/kbugbuster/gui/cwsearchwidget.cpp +++ b/kbugbuster/gui/cwsearchwidget.cpp @@ -37,11 +37,11 @@ CWSearchWidget::CWSearchWidget( TQWidget *parent , const char * name ) f.setBold( true ); m_searchLabel->setFont( f ); - connect( m_searchDesc, TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT( textDescriptionChanged ( const TQString & ) ) ); + connect( m_searchDesc, TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT( textDescriptionChanged ( const TQString & ) ) ); - connect( m_searchBugNumber, TQT_SIGNAL( textChanged ( const TQString & ) ), - this, TQT_SLOT( textNumberChanged ( const TQString & ) ) ); + connect( m_searchBugNumber, TQ_SIGNAL( textChanged ( const TQString & ) ), + this, TQ_SLOT( textNumberChanged ( const TQString & ) ) ); m_searchDescBtn->setEnabled( !m_searchDesc->text().isEmpty() ); m_searchBugNumberBtn->setEnabled( !m_searchBugNumber->text().isEmpty() ); diff --git a/kbugbuster/gui/kbbbookmarkmanager.h b/kbugbuster/gui/kbbbookmarkmanager.h index af58a461..37337d34 100644 --- a/kbugbuster/gui/kbbbookmarkmanager.h +++ b/kbugbuster/gui/kbbbookmarkmanager.h @@ -2,7 +2,7 @@ #define KBBBOOKMARKMANAGER_H #include <kbookmarkmanager.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> class KBBBookmarkManager { diff --git a/kbugbuster/gui/kbbmainwindow.cpp b/kbugbuster/gui/kbbmainwindow.cpp index ed61ce52..57c1ec30 100644 --- a/kbugbuster/gui/kbbmainwindow.cpp +++ b/kbugbuster/gui/kbbmainwindow.cpp @@ -113,20 +113,20 @@ KBBMainWindow::KBBMainWindow( const TQCString &initialPackage, m_progressBar->setMinimumWidth( 150 ); m_progressBar->setMaximumHeight( statusBar()->fontMetrics().height() + 6 ); statusBar()->addWidget( m_progressBar ); - connect( m_mainWidget, TQT_SIGNAL( resetProgressBar() ), - m_progressBar, TQT_SLOT( reset() ) ); - connect( m_mainWidget, TQT_SIGNAL( searchPackage() ), - this, TQT_SLOT( searchPackage() ) ); - connect( m_mainWidget, TQT_SIGNAL( searchBugNumber() ), - this, TQT_SLOT( searchBugNumber() ) ); + connect( m_mainWidget, TQ_SIGNAL( resetProgressBar() ), + m_progressBar, TQ_SLOT( reset() ) ); + connect( m_mainWidget, TQ_SIGNAL( searchPackage() ), + this, TQ_SLOT( searchPackage() ) ); + connect( m_mainWidget, TQ_SIGNAL( searchBugNumber() ), + this, TQ_SLOT( searchBugNumber() ) ); - connect( BugSystem::self(), TQT_SIGNAL( infoMessage( const TQString & ) ), - TQT_SLOT( slotStatusMsg( const TQString & ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( infoMessage( const TQString & ) ), + TQ_SLOT( slotStatusMsg( const TQString & ) ) ); - connect( BugSystem::self(), TQT_SIGNAL( infoMessage( const TQString & ) ), - TQT_SLOT( slotStatusMsg( const TQString & ) ) ); - connect( BugSystem::self(), TQT_SIGNAL( infoPercent( unsigned long ) ), - TQT_SLOT( slotSetPercent( unsigned long ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( infoMessage( const TQString & ) ), + TQ_SLOT( slotStatusMsg( const TQString & ) ) ); + connect( BugSystem::self(), TQ_SIGNAL( infoPercent( unsigned long ) ), + TQ_SLOT( slotSetPercent( unsigned long ) ) ); m_mainWidget->readConfig(); } @@ -144,69 +144,69 @@ KBBMainWindow::~KBBMainWindow() void KBBMainWindow::initActions() { // Prepare and create XML GUI - fileQuit = KStdAction::quit( TQT_TQOBJECT(this), - TQT_SLOT( close() ), actionCollection() ); + fileQuit = KStdAction::quit( this, + TQ_SLOT( close() ), actionCollection() ); fileQuit->setToolTip( i18n( "Quit KBugBuster" ) ); - new TDEAction( i18n("See &Pending Changes"), "contents", 0, TQT_TQOBJECT(this), TQT_SLOT( slotListChanges() ), + new TDEAction( i18n("See &Pending Changes"), "contents", 0, this, TQ_SLOT( slotListChanges() ), actionCollection(), "file_seechanges" ); - new TDEAction( i18n("&Submit Changes"), "mail-send", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubmit() ), + new TDEAction( i18n("&Submit Changes"), "mail-send", 0, this, TQ_SLOT( slotSubmit() ), actionCollection(), "file_submit" ); - reloadpacklist = new TDEAction( 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, m_mainWidget, TQ_SLOT( slotReloadPackageList() ), actionCollection(), "reload_packagelist" ); - reloadpack= new TDEAction( 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, m_mainWidget, TQ_SLOT( slotReloadPackage() ), actionCollection(), "reload_package" ); - reloadbug = new TDEAction( 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, m_mainWidget, TQ_SLOT( slotReloadBug() ), actionCollection(), "reload_bug" ); - loadMyBugs = new TDEAction( i18n( "Load &My Bugs List" ), 0, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotLoadMyBugs() ), + loadMyBugs = new TDEAction( i18n( "Load &My Bugs List" ), 0, m_mainWidget, TQ_SLOT( slotLoadMyBugs() ), actionCollection(), "load_my_bugs" ); - 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"), "document-save", TQt::Key_F4, TQT_TQOBJECT(m_mainWidget), TQT_SLOT( slotExtractAttachments() ), + reloadall = new TDEAction( i18n("Load All Bug Details (for current product)"), TQt::Key_F6, m_mainWidget, TQ_SLOT( slotRetrieveAllBugDetails() ), actionCollection(), "load_allbugs" ); + new TDEAction( i18n("Extract &Attachments"), "document-save", TQt::Key_F4, m_mainWidget, TQ_SLOT( slotExtractAttachments() ), actionCollection(), "extract_attachments" ); - new TDEAction( i18n("Clear Cache"), 0, TQT_TQOBJECT(this), TQT_SLOT( clearCache() ), + new TDEAction( i18n("Clear Cache"), 0, this, TQ_SLOT( clearCache() ), actionCollection(), "clear_cache" ); - new TDEAction( i18n("&Search by Product..."), "goto", CTRL+TQt::Key_P, TQT_TQOBJECT(this), - TQT_SLOT( searchPackage() ), actionCollection(), "search_package" ); - new TDEAction( i18n("Search by Bug &Number..."), "filefind", CTRL+TQt::Key_N, TQT_TQOBJECT(this), - TQT_SLOT( searchBugNumber() ), actionCollection(), "search_bugnumber" ); + new TDEAction( i18n("&Search by Product..."), "goto", CTRL+TQt::Key_P, this, + TQ_SLOT( searchPackage() ), actionCollection(), "search_package" ); + new TDEAction( i18n("Search by Bug &Number..."), "filefind", CTRL+TQt::Key_N, this, + TQ_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 TDEAction( i18n("Search by &Description...") ,"edit-find", CTRL+TQt::Key_D, TQT_TQOBJECT(this), - TQT_SLOT( searchDescription() ), actionCollection(), "search_description" ); - -// new TDEAction( i18n("&Merge"), "view_remove", CTRL+TQt::Key_M, TQT_TQOBJECT(m_mainWidget), -// TQT_SLOT( mergeBugs() ), actionCollection(), "cmd_merge" ); -// new TDEAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+TQt::Key_M, TQT_TQOBJECT(m_mainWidget), -// TQT_SLOT( unmergeBugs() ), actionCollection(), "cmd_unmerge" ); - new TDEAction( i18n("C&lose..."), "edittrash", CTRL+TQt::Key_L, TQT_TQOBJECT(m_mainWidget), - TQT_SLOT( closeBug() ), actionCollection(), "cmd_close" ); -// new TDEAction( i18n("Clos&e Silently"), "edittrash", CTRL+TQt::Key_E, TQT_TQOBJECT(m_mainWidget), -// TQT_SLOT( closeBugSilently() ), actionCollection(), "cmd_close_silently" ); - new TDEAction( i18n("Re&open"), "idea", CTRL+TQt::Key_O, TQT_TQOBJECT(m_mainWidget), - TQT_SLOT( reopenBug() ), actionCollection(), "cmd_reopen" ); -// new TDEAction( i18n("Re&assign..."), "folder-new", CTRL+TQt::Key_A, TQT_TQOBJECT(m_mainWidget), -// TQT_SLOT( reassignBug() ), actionCollection(), "cmd_reassign" ); -// new TDEAction( i18n("Change &Title..."), "format-text-underline", CTRL+TQt::Key_T, TQT_TQOBJECT(m_mainWidget), -// TQT_SLOT( titleBug() ), actionCollection(), "cmd_title" ); -// new TDEAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, TQT_TQOBJECT(m_mainWidget), -// TQT_SLOT( severityBug() ), actionCollection(), "cmd_severity" ); - new TDEAction( i18n("&Reply..."), "mail-reply-all",CTRL+TQt::Key_R , TQT_TQOBJECT(m_mainWidget), - TQT_SLOT( replyBug() ), actionCollection(), "cmd_reply" ); - new TDEAction( i18n("Reply &Privately..."), "mail-reply-sender", CTRL+TQt::Key_I, TQT_TQOBJECT(m_mainWidget), - TQT_SLOT( replyPrivateBug() ), actionCollection(), "cmd_replyprivate" ); - - KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT( slotToggleMenubar() ), actionCollection() ); + new TDEAction( i18n("Search by &Description...") ,"edit-find", CTRL+TQt::Key_D, this, + TQ_SLOT( searchDescription() ), actionCollection(), "search_description" ); + +// new TDEAction( i18n("&Merge"), "view_remove", CTRL+TQt::Key_M, m_mainWidget, +// TQ_SLOT( mergeBugs() ), actionCollection(), "cmd_merge" ); +// new TDEAction( i18n("&Unmerge"), "view_top_bottom", CTRL+SHIFT+TQt::Key_M, m_mainWidget, +// TQ_SLOT( unmergeBugs() ), actionCollection(), "cmd_unmerge" ); + new TDEAction( i18n("C&lose..."), "edittrash", CTRL+TQt::Key_L, m_mainWidget, + TQ_SLOT( closeBug() ), actionCollection(), "cmd_close" ); +// new TDEAction( i18n("Clos&e Silently"), "edittrash", CTRL+TQt::Key_E, m_mainWidget, +// TQ_SLOT( closeBugSilently() ), actionCollection(), "cmd_close_silently" ); + new TDEAction( i18n("Re&open"), "idea", CTRL+TQt::Key_O, m_mainWidget, + TQ_SLOT( reopenBug() ), actionCollection(), "cmd_reopen" ); +// new TDEAction( i18n("Re&assign..."), "folder-new", CTRL+TQt::Key_A, m_mainWidget, +// TQ_SLOT( reassignBug() ), actionCollection(), "cmd_reassign" ); +// new TDEAction( i18n("Change &Title..."), "format-text-underline", CTRL+TQt::Key_T, m_mainWidget, +// TQ_SLOT( titleBug() ), actionCollection(), "cmd_title" ); +// new TDEAction( i18n("Change &Severity..."), "edit", CTRL+TQt::Key_S, m_mainWidget, +// TQ_SLOT( severityBug() ), actionCollection(), "cmd_severity" ); + new TDEAction( i18n("&Reply..."), "mail-reply-all",CTRL+TQt::Key_R , m_mainWidget, + TQ_SLOT( replyBug() ), actionCollection(), "cmd_reply" ); + new TDEAction( i18n("Reply &Privately..."), "mail-reply-sender", CTRL+TQt::Key_I, m_mainWidget, + TQ_SLOT( replyPrivateBug() ), actionCollection(), "cmd_replyprivate" ); + + KStdAction::showMenubar(this, TQ_SLOT( slotToggleMenubar() ), actionCollection() ); #if KDE_IS_VERSION( 3, 1, 90 ) createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); #endif m_disconnectedAction = new TDEToggleAction( i18n("&Disconnected Mode"), 0, - TQT_TQOBJECT(this), - TQT_SLOT( slotDisconnectedAction() ), + this, + TQ_SLOT( slotDisconnectedAction() ), actionCollection(), "settings_disconnected" ); m_disconnectedAction->setChecked( BugSystem::self()->disconnected() ); @@ -215,16 +215,16 @@ void KBBMainWindow::initActions() 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() ); + KStdAction::preferences( this, TQ_SLOT(preferences()), actionCollection() ); - TDEToggleAction *toggleTmp = new TDEToggleAction( i18n("Show Closed Bugs"), "application-x-trash", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleDone() ), + TDEToggleAction *toggleTmp = new TDEToggleAction( i18n("Show Closed Bugs"), "application-x-trash", 0, this, TQ_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 TDEToggleAction( i18n("Show Wishes"), "bookmark", 0, TQT_TQOBJECT(this), TQT_SLOT( slotToggleWishes() ), + toggleTmp =new TDEToggleAction( i18n("Show Wishes"), "bookmark", 0, this, TQ_SLOT( slotToggleWishes() ), actionCollection(), "cmd_toggle_wishes" ); #if KDE_IS_VERSION( 3, 2, 90 ) toggleTmp->setCheckedState(i18n("Hide Wishes")); @@ -232,19 +232,19 @@ void KBBMainWindow::initActions() toggleTmp->setChecked(KBBPrefs::instance()->mShowWishes); mSelectServerAction = new TDESelectAction( i18n( "Select Server" ), 0, 0, - TQT_TQOBJECT(this), - TQT_SLOT( slotSelectServer() ), + this, + TQ_SLOT( slotSelectServer() ), actionCollection(), "select_server" ); setupSelectServerAction(); if ( KBBPrefs::instance()->mDebugMode ) { - new TDEAction( i18n("Show Last Server Response..."), 0 , TQT_TQOBJECT(this), - TQT_SLOT( showLastResponse() ), actionCollection(), + new TDEAction( i18n("Show Last Server Response..."), 0 , this, + TQ_SLOT( showLastResponse() ), actionCollection(), "debug_lastresponse" ); - new TDEAction( i18n("Show Bug HTML Source..."), 0 , TQT_TQOBJECT(this), - TQT_SLOT( showBugSource() ), actionCollection(), + new TDEAction( i18n("Show Bug HTML Source..."), 0 , this, + TQ_SLOT( showBugSource() ), actionCollection(), "debug_showbugsource" ); } @@ -308,7 +308,7 @@ void KBBMainWindow::openBookmarkURL( const TQString & url ) } } -// --- TQT_SLOT IMPLEMENTATIONS ------------------------------------------------- +// --- SLOT IMPLEMENTATIONS ------------------------------------------------- void KBBMainWindow::slotDisconnectedAction() { @@ -432,10 +432,10 @@ void KBBMainWindow::preferences() { if (!mPreferencesDialog) { mPreferencesDialog = new PreferencesDialog(this); - connect( mPreferencesDialog, TQT_SIGNAL( configChanged() ), - TQT_SLOT( setupSelectServerAction() ) ); - connect( mPreferencesDialog, TQT_SIGNAL( configChanged() ), - m_mainWidget, TQT_SLOT( slotReloadPackage() ) ); + connect( mPreferencesDialog, TQ_SIGNAL( configChanged() ), + TQ_SLOT( setupSelectServerAction() ) ); + connect( mPreferencesDialog, TQ_SIGNAL( configChanged() ), + m_mainWidget, TQ_SLOT( slotReloadPackage() ) ); } mPreferencesDialog->show(); mPreferencesDialog->raise(); diff --git a/kbugbuster/gui/loadallbugsdlg.cpp b/kbugbuster/gui/loadallbugsdlg.cpp index cea52ef1..63210965 100644 --- a/kbugbuster/gui/loadallbugsdlg.cpp +++ b/kbugbuster/gui/loadallbugsdlg.cpp @@ -21,25 +21,25 @@ #include <tqtimer.h> LoadAllBugsDlg::LoadAllBugsDlg( const Package& pkg, const TQString &component ) - : TQDialog( 0L, "progressdlg", TRUE ) + : TQDialog( 0L, "progressdlg", true ) { m_bugLoadingProgress = new TDEIO::DefaultProgress( this ); - connect( m_bugLoadingProgress, TQT_SIGNAL( stopped() ), - this, TQT_SLOT( slotStopped() ) ); + connect( m_bugLoadingProgress, TQ_SIGNAL( stopped() ), + this, TQ_SLOT( slotStopped() ) ); setCaption( i18n( "Loading All Bugs for Product %1" ).arg( pkg.name() ) ); connect( BugSystem::self(), - TQT_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), - TQT_SLOT( slotBugDetailsAvailable( const Bug &, const BugDetails & ) ) ); + TQ_SIGNAL( bugDetailsAvailable( const Bug &, const BugDetails & ) ), + TQ_SLOT( slotBugDetailsAvailable( const Bug &, const BugDetails & ) ) ); connect( BugSystem::self(), - TQT_SIGNAL( bugDetailsLoadingError() ), - TQT_SLOT( slotBugDetailsLoadingError() ) ); + TQ_SIGNAL( bugDetailsLoadingError() ), + TQ_SLOT( slotBugDetailsLoadingError() ) ); // The package (and its buglist) has to be in the cache already... m_bugs = BugSystem::self()->cache()->loadBugList( pkg, component, true ); m_count = m_bugs.count(); m_bugLoadingProgress->slotTotalSize( 0, m_count ); kdDebug() << "LoadAllBugsDlg: " << m_count << " bugs to load" << endl; m_processed = 0; - TQTimer::singleShot( 0, this, TQT_SLOT( loadNextBug() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( loadNextBug() ) ); } void LoadAllBugsDlg::slotBugDetailsAvailable( const Bug &bug, const BugDetails & ) diff --git a/kbugbuster/gui/messageeditor.cpp b/kbugbuster/gui/messageeditor.cpp index d5a6428e..e07ec297 100644 --- a/kbugbuster/gui/messageeditor.cpp +++ b/kbugbuster/gui/messageeditor.cpp @@ -29,15 +29,15 @@ MessageEditor::MessageEditor( TQWidget *parent ) mSelectionCombo = new TQComboBox(topFrame); selectionLayout->addWidget(mSelectionCombo); - connect(mSelectionCombo,TQT_SIGNAL(activated(int)),TQT_SLOT(changeMessage())); + connect(mSelectionCombo,TQ_SIGNAL(activated(int)),TQ_SLOT(changeMessage())); TQPushButton *addButton = new TQPushButton(i18n("Add Button..."),topFrame); selectionLayout->addWidget(addButton); - connect(addButton,TQT_SIGNAL(clicked()),TQT_SLOT(addButton())); + connect(addButton,TQ_SIGNAL(clicked()),TQ_SLOT(addButton())); TQPushButton *removeButton = new TQPushButton(i18n("Remove Button"),topFrame); selectionLayout->addWidget(removeButton); - connect(removeButton,TQT_SIGNAL(clicked()),TQT_SLOT(removeButton())); + connect(removeButton,TQ_SIGNAL(clicked()),TQ_SLOT(removeButton())); mMessageEdit = new KTextEdit(topFrame); topLayout->addWidget(mMessageEdit,1); diff --git a/kbugbuster/gui/msginputdialog.cpp b/kbugbuster/gui/msginputdialog.cpp index a1e10a38..a16564e4 100644 --- a/kbugbuster/gui/msginputdialog.cpp +++ b/kbugbuster/gui/msginputdialog.cpp @@ -94,10 +94,10 @@ MsgInputDialog::MsgInputDialog(MsgInputDialog::MessageType type, const Bug &bug, updatePresets(); l->setBuddy( mPresets ); - connect( mPresets, TQT_SIGNAL( executed( TQListBoxItem* ) ), - TQT_SLOT( slotPresetSelected( TQListBoxItem * ) ) ); - connect( this, TQT_SIGNAL( user2Clicked() ), TQT_SLOT( editPresets() ) ); - connect( this, TQT_SIGNAL( user1Clicked() ), TQT_SLOT( clearMessage() ) ); + connect( mPresets, TQ_SIGNAL( executed( TQListBoxItem* ) ), + TQ_SLOT( slotPresetSelected( TQListBoxItem * ) ) ); + connect( this, TQ_SIGNAL( user2Clicked() ), TQ_SLOT( editPresets() ) ); + connect( this, TQ_SIGNAL( user1Clicked() ), TQ_SLOT( clearMessage() ) ); mMessageEdit->setFocus(); if ( !quotedMsg.isEmpty() ) diff --git a/kbugbuster/gui/packageselectdialog.cpp b/kbugbuster/gui/packageselectdialog.cpp index ccd18880..ddb1b42d 100644 --- a/kbugbuster/gui/packageselectdialog.cpp +++ b/kbugbuster/gui/packageselectdialog.cpp @@ -56,10 +56,10 @@ PackageSelectDialog::PackageSelectDialog(TQWidget *parent,const char *name) : mRecentList->resize( mRecentList->width(), mRecentList->fontMetrics().height() * KBBPrefs::instance()->mRecentPackagesCount ); - connect( mRecentList, TQT_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ), - TQT_SLOT( recentSelected( int, TQListViewItem * ) ) ); - connect( mRecentList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( slotOk() ) ); + connect( mRecentList, TQ_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ), + TQ_SLOT( recentSelected( int, TQListViewItem * ) ) ); + connect( mRecentList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( slotOk() ) ); mCompletion = new TDECompletion; mCompletion->setCompletionMode( TDEGlobalSettings::CompletionAuto ); @@ -69,21 +69,21 @@ PackageSelectDialog::PackageSelectDialog(TQWidget *parent,const char *name) : mCompleteList->addColumn( i18n("Description") ); mCompleteList->setRootIsDecorated(true); mCompleteList->setAllColumnsShowFocus( true ); - connect( mCompleteList, TQT_SIGNAL( typed( const TQString & ) ), - TQT_SLOT( completeTyped( const TQString & ) ) ); + connect( mCompleteList, TQ_SIGNAL( typed( const TQString & ) ), + TQ_SLOT( completeTyped( const TQString & ) ) ); - connect( mCompleteList, TQT_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ), - TQT_SLOT( completeSelected( int, TQListViewItem * ) ) ); - connect( mCompleteList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ), - TQT_SLOT( slotOk() ) ); + connect( mCompleteList, TQ_SIGNAL( mouseButtonPressed( int, TQListViewItem *, const TQPoint &, int) ), + TQ_SLOT( completeSelected( int, TQListViewItem * ) ) ); + connect( mCompleteList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ), + TQ_SLOT( slotOk() ) ); mPackageEdit = new KLineEdit( topWidget ); mPackageEdit->setFocus(); topLayout->addWidget( mPackageEdit ); - connect( mPackageEdit, TQT_SIGNAL( textChanged( const TQString & ) ), - TQT_SLOT( completeTyped( const TQString & ) ) ); + connect( mPackageEdit, TQ_SIGNAL( textChanged( const TQString & ) ), + TQ_SLOT( completeTyped( const TQString & ) ) ); enableButtonOK( !mPackageEdit->text().isEmpty() ); } diff --git a/kbugbuster/gui/preferencesdialog.cpp b/kbugbuster/gui/preferencesdialog.cpp index a7a99478..233adbaf 100644 --- a/kbugbuster/gui/preferencesdialog.cpp +++ b/kbugbuster/gui/preferencesdialog.cpp @@ -90,19 +90,19 @@ void PreferencesDialog::setupServerPage() layout->addWidget( buttonBox ); TQPushButton *addButton = new TQPushButton( i18n("Add Server..."), buttonBox ); - connect( addButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addServer() ) ); + connect( addButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addServer() ) ); TQPushButton *editButton = new TQPushButton( i18n("Edit Server..."), buttonBox ); - connect( editButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editServer() ) ); + connect( editButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editServer() ) ); TQPushButton *removeButton = new TQPushButton( i18n("Delete Server"), buttonBox ); - connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeServer() ) ); + connect( removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeServer() ) ); TQPushButton *button = new TQPushButton( i18n("Select Server From List..."), topFrame ); layout->addWidget( button ); - connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( selectServer() ) ); - connect( mServerList, TQT_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQT_SLOT( editServer())); + connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( selectServer() ) ); + connect( mServerList, TQ_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQ_SLOT( editServer())); } void PreferencesDialog::setupAdvancedPage() @@ -132,8 +132,8 @@ void PreferencesDialog::setupAdvancedPage() mMinVotesInput = new KIntNumInput( topFrame ); mMinVotesInput->setMinValue( 0 ); - connect( mShowVotedCheckBox, TQT_SIGNAL(toggled(bool)), - mMinVotesInput, TQT_SLOT(setEnabled(bool)) ); + connect( mShowVotedCheckBox, TQ_SIGNAL(toggled(bool)), + mMinVotesInput, TQ_SLOT(setEnabled(bool)) ); layout->addWidget( mMinVotesInput ); mSendBccCheckBox = new TQCheckBox( i18n( "Send BCC to myself" ), topFrame ); @@ -289,7 +289,7 @@ SelectServerDlg::SelectServerDlg(PreferencesDialog *parent, const char */*name*/ parent->createServerItem( list, "Xorg", "http://bugs.freedesktop.org/", "4.0.7" ); parent->createServerItem( list, "RedHat", "http://bugzilla.redhat.com/bugzilla/", "4.2.2" ); parent->createServerItem( list, "Mandriva", "http://qa.mandriva.com/", "4.0.6" ); - connect( list, TQT_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQT_SLOT( slotDoubleClicked( TQListViewItem *))); + connect( list, TQ_SIGNAL( doubleClicked ( TQListViewItem *)), this, TQ_SLOT( slotDoubleClicked( TQListViewItem *))); } diff --git a/kbugbuster/main.cpp b/kbugbuster/main.cpp index 4fd3a383..ae021f74 100644 --- a/kbugbuster/main.cpp +++ b/kbugbuster/main.cpp @@ -73,8 +73,8 @@ int main(int argc, char *argv[]) // Since all background jobs remaing running after closing the // main window we force a quit here - TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), - &app, TQT_SLOT( quit() ) ); + TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), + &app, TQ_SLOT( quit() ) ); mainWin->show(); return app.exec(); } diff --git a/kbugbuster/tderesources/kcalresource.cpp b/kbugbuster/tderesources/kcalresource.cpp index 5cc58b39..d17dff07 100644 --- a/kbugbuster/tderesources/kcalresource.cpp +++ b/kbugbuster/tderesources/kcalresource.cpp @@ -30,7 +30,7 @@ #include <kurl.h> #include <tdeio/job.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <vcaldrag.h> #include <vcalformat.h> @@ -175,9 +175,9 @@ bool KCalResource::doLoad() Package package = kbb->package( mPrefs->product() ); - connect( kbb, TQT_SIGNAL( bugListAvailable( const Package &, const TQString &, + connect( kbb, TQ_SIGNAL( bugListAvailable( const Package &, const TQString &, const Bug::List & ) ), - TQT_SLOT( slotBugListAvailable( const Package &, const TQString &, + TQ_SLOT( slotBugListAvailable( const Package &, const TQString &, const Bug::List & ) ) ); kbb->retrieveBugList( package, mPrefs->component() ); @@ -268,8 +268,8 @@ bool KCalResource::doSave() mCalendar.save( cacheFile() ); mUploadJob = TDEIO::file_copy( KURL( cacheFile() ), mUploadUrl, -1, true ); - connect( mUploadJob, TQT_SIGNAL( result( TDEIO::Job * ) ), - TQT_SLOT( slotSaveJobResult( TDEIO::Job * ) ) ); + connect( mUploadJob, TQ_SIGNAL( result( TDEIO::Job * ) ), + TQ_SLOT( slotSaveJobResult( TDEIO::Job * ) ) ); return true; } diff --git a/kbugbuster/tderesources/kcalresource_plugin.cpp b/kbugbuster/tderesources/kcalresource_plugin.cpp index d9f33ec9..fef50787 100644 --- a/kbugbuster/tderesources/kcalresource_plugin.cpp +++ b/kbugbuster/tderesources/kcalresource_plugin.cpp @@ -29,7 +29,7 @@ using namespace KCal; extern "C" { - KDE_EXPORT void *init_kcal_bugzilla() + TDE_EXPORT void *init_kcal_bugzilla() { TDEGlobal::locale()->insertCatalogue( "kres_bugzilla" ); return new KRES::PluginFactory<KCalResource,KCalResourceConfig>(); diff --git a/kbugbuster/tderesources/kcalresourceconfig.cpp b/kbugbuster/tderesources/kcalresourceconfig.cpp index d3f37a55..c6477ff4 100644 --- a/kbugbuster/tderesources/kcalresourceconfig.cpp +++ b/kbugbuster/tderesources/kcalresourceconfig.cpp @@ -27,7 +27,7 @@ #include <klineedit.h> #include <tdelocale.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kdialog.h> #include "kcalresource.h" diff --git a/kdeaccounts-plugin/kdeaccountsformat.cpp b/kdeaccounts-plugin/kdeaccountsformat.cpp index 8c01307c..6c4403d1 100644 --- a/kdeaccounts-plugin/kdeaccountsformat.cpp +++ b/kdeaccounts-plugin/kdeaccountsformat.cpp @@ -9,7 +9,7 @@ extern "C" { - KDE_EXPORT TDEABC::FormatPlugin *format() + TDE_EXPORT TDEABC::FormatPlugin *format() { return new KDEAccountsFormat(); } diff --git a/kmtrace/CMakeLists.txt b/kmtrace/CMakeLists.txt index 126a1013..bb4dcd29 100644 --- a/kmtrace/CMakeLists.txt +++ b/kmtrace/CMakeLists.txt @@ -54,7 +54,7 @@ tde_add_library( ktrace_s STATIC tde_add_library( ktrace SHARED SOURCES ksotrace.cpp ktrace.c - LINK ${DL_LIBRARIES} ${Backtrace_LIBRARY} + LINK ${CMAKE_DL_LIBS} ${Backtrace_LIBRARY} DESTINATION ${LIB_INSTALL_DIR}/kmtrace ) diff --git a/kmtrace/demangle.cpp b/kmtrace/demangle.cpp index 800629c9..5b90d1c6 100644 --- a/kmtrace/demangle.cpp +++ b/kmtrace/demangle.cpp @@ -8,8 +8,8 @@ #include <tqvaluelist.h> #include <stdlib.h> #include <tdetempfile.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <tdecmdlineargs.h> extern "C" { diff --git a/kmtrace/kmtrace.cpp b/kmtrace/kmtrace.cpp index 477cae7d..0fd6da8f 100644 --- a/kmtrace/kmtrace.cpp +++ b/kmtrace/kmtrace.cpp @@ -13,10 +13,10 @@ #include <tqvaluelist.h> #include <stdlib.h> #include <tdetempfile.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <tdecmdlineargs.h> -#include <kprocess.h> +#include <tdeprocess.h> extern "C" { /* Options passed to cplus_demangle (in 2nd parameter). */ diff --git a/kmtrace/match.cpp b/kmtrace/match.cpp index ee00ca43..d8d5b98f 100644 --- a/kmtrace/match.cpp +++ b/kmtrace/match.cpp @@ -8,8 +8,8 @@ #include <tqvaluelist.h> #include <stdlib.h> #include <tdetempfile.h> -#include <kinstance.h> -#include <kstandarddirs.h> +#include <tdeinstance.h> +#include <tdestandarddirs.h> #include <tdecmdlineargs.h> int main(int argc, char **argv) diff --git a/kompare/DESIGN b/kompare/DESIGN index 9f1ddafd..fde8a5c9 100644 --- a/kompare/DESIGN +++ b/kompare/DESIGN @@ -10,7 +10,7 @@ The diffmodel is comparable to a document and the view part is comparable to the view and the komparemodellist is comparable to a documentmanager. The navtree can be viewed as a document view manager. The model is fully separated from the view and all communication goes -through Q_SIGNALS and Q_SLOTS. The view gets a model that contains all differences +through signals and slots. The view gets a model that contains all differences for the compared files A and B. The view gets this model from the modellist, the central entity in the part. diff --git a/kompare/interfaces/kompareinterface.h b/kompare/interfaces/kompareinterface.h index 06ab7a77..e4109863 100644 --- a/kompare/interfaces/kompareinterface.h +++ b/kompare/interfaces/kompareinterface.h @@ -6,14 +6,14 @@ #include <tqstring.h> #include <tqstringlist.h> -#include <kdemacros.h> +#include <tdemacros.h> class TDEConfig; class KURL; class KompareInterfacePrivate; -class KDE_EXPORT KompareInterface +class TDE_EXPORT KompareInterface { public: KompareInterface(); diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp index 55027091..2d0231a7 100644 --- a/kompare/kompare_shell.cpp +++ b/kompare/kompare_shell.cpp @@ -83,10 +83,10 @@ KompareShell::KompareShell() KLibFactory *mainViewFactory = KLibLoader::self()->factory( ptr->library().ascii() ); if (mainViewFactory) { - m_mainViewDock = createDockWidget( "View", kapp->icon() ); + m_mainViewDock = createDockWidget( "View", tdeApp->icon() ); // now that the Part is loaded, we cast it to a KomparePart to get // our hands on it - m_viewPart = static_cast<KomparePart*>(mainViewFactory->create(TQT_TQOBJECT(m_mainViewDock), + m_viewPart = static_cast<KomparePart*>(mainViewFactory->create(m_mainViewDock, "kompare_part", "KParts::ReadWritePart" )); if ( m_viewPart ) @@ -120,9 +120,9 @@ KompareShell::KompareShell() KLibFactory *navTreeFactory = KLibLoader::self()->factory( ptr->library().ascii() ); if (navTreeFactory) { - m_navTreeDock = createDockWidget( "Navigation", kapp->icon() ); + m_navTreeDock = createDockWidget( "Navigation", tdeApp->icon() ); - m_navTreePart = static_cast<KompareNavTreePart*>(navTreeFactory->create(TQT_TQOBJECT(m_navTreeDock), + m_navTreePart = static_cast<KompareNavTreePart*>(navTreeFactory->create(m_navTreeDock, "komparenavtreepart", "KParts::ReadOnlyPart" )); if ( m_navTreePart ) @@ -140,21 +140,21 @@ KompareShell::KompareShell() } // Hook up the inter part communication - connect( m_viewPart, TQT_SIGNAL( modelsChanged(const Diff2::DiffModelList*) ), - m_navTreePart, TQT_SLOT( slotModelsChanged( const Diff2::DiffModelList*) ) ); + connect( m_viewPart, TQ_SIGNAL( modelsChanged(const Diff2::DiffModelList*) ), + m_navTreePart, TQ_SLOT( slotModelsChanged( const Diff2::DiffModelList*) ) ); - connect( m_viewPart, TQT_SIGNAL( kompareInfo(Kompare::Info*) ), - m_navTreePart, TQT_SLOT( slotKompareInfo(Kompare::Info*) ) ); + connect( m_viewPart, TQ_SIGNAL( kompareInfo(Kompare::Info*) ), + m_navTreePart, TQ_SLOT( slotKompareInfo(Kompare::Info*) ) ); - connect( m_navTreePart, TQT_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ), - m_viewPart, TQT_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ) ); - connect( m_viewPart, TQT_SIGNAL( setSelection(const Diff2::DiffModel*, const Diff2::Difference*) ), - m_navTreePart, TQT_SLOT( slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*) ) ); + connect( m_navTreePart, TQ_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ), + m_viewPart, TQ_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ) ); + connect( m_viewPart, TQ_SIGNAL( setSelection(const Diff2::DiffModel*, const Diff2::Difference*) ), + m_navTreePart, TQ_SLOT( slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*) ) ); - connect( m_navTreePart, TQT_SIGNAL( selectionChanged(const Diff2::Difference*) ), - m_viewPart, TQT_SIGNAL( selectionChanged(const Diff2::Difference*) ) ); - connect( m_viewPart, TQT_SIGNAL( setSelection(const Diff2::Difference*) ), - m_navTreePart, TQT_SLOT( slotSetSelection(const Diff2::Difference*) ) ); + connect( m_navTreePart, TQ_SIGNAL( selectionChanged(const Diff2::Difference*) ), + m_viewPart, TQ_SIGNAL( selectionChanged(const Diff2::Difference*) ) ); + connect( m_viewPart, TQ_SIGNAL( setSelection(const Diff2::Difference*) ), + m_navTreePart, TQ_SLOT( slotSetSelection(const Diff2::Difference*) ) ); // This is the interpart interface, it is signal and slot based so no "real" nterface here // All you have to do is connect the parts from your application. @@ -162,18 +162,18 @@ KompareShell::KompareShell() // from the method with the same name in KompareModelList. // There is currently no applying possible from the navtreepart to the viewpart - connect( m_viewPart, TQT_SIGNAL(applyDifference(bool)), - m_navTreePart, TQT_SLOT(slotApplyDifference(bool)) ); - connect( m_viewPart, TQT_SIGNAL(applyAllDifferences(bool)), - m_navTreePart, TQT_SLOT(slotApplyAllDifferences(bool)) ); - connect( m_viewPart, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)), - m_navTreePart, TQT_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) ); + connect( m_viewPart, TQ_SIGNAL(applyDifference(bool)), + m_navTreePart, TQ_SLOT(slotApplyDifference(bool)) ); + connect( m_viewPart, TQ_SIGNAL(applyAllDifferences(bool)), + m_navTreePart, TQ_SLOT(slotApplyAllDifferences(bool)) ); + connect( m_viewPart, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)), + m_navTreePart, TQ_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) ); // Hook up the KomparePart -> KompareShell communication - connect( m_viewPart, TQT_SIGNAL( setStatusBarModelInfo( int, int, int, int, int ) ), - TQT_TQOBJECT(this), TQT_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) ); - connect( m_viewPart, TQT_SIGNAL( setStatusBarText(const TQString&) ), - TQT_TQOBJECT(this), TQT_SLOT( slotSetStatusBarText(const TQString&) ) ); + connect( m_viewPart, TQ_SIGNAL( setStatusBarModelInfo( int, int, int, int, int ) ), + this, TQ_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) ); + connect( m_viewPart, TQ_SIGNAL( setStatusBarText(const TQString&) ), + this, TQ_SLOT( slotSetStatusBarText(const TQString&) ) ); // Read basic main-view settings, and set to autosave setAutoSaveSettings( "General Options" ); @@ -181,7 +181,7 @@ KompareShell::KompareShell() KompareShell::~KompareShell() { - kapp->deref(); + tdeApp->deref(); } bool KompareShell::queryClose() @@ -229,26 +229,26 @@ void KompareShell::blend( const KURL& url1, const KURL& diff ) void KompareShell::setupActions() { - TDEAction* open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + TDEAction* open = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); open->setText( i18n( "&Open Diff..." ) ); new TDEAction( i18n("&Compare Files..."), "document-open", TQt::CTRL + TQt::Key_C, - TQT_TQOBJECT(this), TQT_SLOT(slotFileCompareFiles()), + this, TQ_SLOT(slotFileCompareFiles()), actionCollection(), "file_compare_files" ); new TDEAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B, - TQT_TQOBJECT(this), TQT_SLOT(slotFileBlendURLAndDiff()), + this, TQ_SLOT(slotFileBlendURLAndDiff()), actionCollection(), "file_blend_url" ); - KStdAction::quit( TQT_TQOBJECT(this), TQT_SLOT( slotFileClose() ), actionCollection() ); + KStdAction::quit( this, TQ_SLOT( slotFileClose() ), actionCollection() ); #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90) createStandardStatusBarAction(); #endif setStandardToolBarMenuEnabled(true); - m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTextView()), + m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, this, TQ_SLOT(slotShowTextView()), actionCollection(), "options_show_text_view" ); m_showTextView->setCheckedState(i18n("Hide T&ext View")); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection()); + KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection()); } void KompareShell::setupStatusBar() @@ -356,7 +356,7 @@ void KompareShell::slotFileOpen() KURL url = KFileDialog::getOpenURL( TQString(), "text/x-diff", this ); if( !url.isEmpty() ) { KompareShell* shell = new KompareShell(); - kapp->ref(); + tdeApp->ref(); shell->show(); shell->openDiff( url ); } @@ -383,7 +383,7 @@ void KompareShell::slotFileBlendURLAndDiff() m_sourceURL = dialog->getFirstURL(); m_destinationURL = dialog->getSecondURL(); KompareShell* shell = new KompareShell(); - kapp->ref(); + tdeApp->ref(); shell->show(); shell->m_viewPart->setEncoding( dialog->encoding() ); shell->blend( m_sourceURL, m_destinationURL ); @@ -412,7 +412,7 @@ void KompareShell::slotFileCompareFiles() m_sourceURL = dialog->getFirstURL(); m_destinationURL = dialog->getSecondURL(); KompareShell* shell = new KompareShell(); - kapp->ref(); + tdeApp->ref(); shell->show(); kdDebug() << "Damn it, i should be called !!! Oh and encoding is: " << dialog->encoding() << endl; shell->m_viewPart->setEncoding( dialog->encoding() ); @@ -439,14 +439,14 @@ void KompareShell::slotShowTextView() m_textViewWidget = createDockWidget( i18n("Text View"), SmallIcon( "text") ); m_textViewPart = KParts::ComponentFactory::createPartInstanceFromQuery<KTextEditor::Document>( TQString::fromLatin1("KTextEditor/Document"), - TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0, TQStringList(), &errCode ); + TQString(), this, 0, this, 0, TQStringList(), &errCode ); if ( m_textViewPart ) { m_textView = m_textViewPart->createView( this, 0 ); - m_textViewWidget->setWidget( static_cast<TQWidget*>(m_textView) ); + m_textViewWidget->setWidget( m_textView ); m_textEditIface = editInterface( m_textViewPart ); - connect( m_viewPart, TQT_SIGNAL(diffString(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(slotSetDiffString(const TQString&)) ); + connect( m_viewPart, TQ_SIGNAL(diffString(const TQString&)), + this, TQ_SLOT(slotSetDiffString(const TQString&)) ); } } @@ -475,7 +475,7 @@ void KompareShell::optionsConfigureToolbars() saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() ); // use the standard toolbar editor KEditToolbar dlg(factory()); - connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig())); + connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(newToolbarConfig())); dlg.exec(); } diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp index e5bd5fc8..d7637ab8 100644 --- a/kompare/komparenavtreepart/komparenavtreepart.cpp +++ b/kompare/komparenavtreepart/komparenavtreepart.cpp @@ -38,7 +38,7 @@ using namespace Diff2; KompareNavTreePart::KompareNavTreePart( TQWidget* parent, const char* name ) - : KParts::ReadOnlyPart( TQT_TQOBJECT(parent), name ), + : KParts::ReadOnlyPart( parent, name ), m_splitter( 0 ), m_modelList( 0 ), m_srcDirTree( 0 ), @@ -82,14 +82,14 @@ KompareNavTreePart::KompareNavTreePart( TQWidget* parent, const char* name ) m_changesList->setRootIsDecorated( false ); m_changesList->setSorting( 0, true ); - connect( m_srcDirTree, TQT_SIGNAL(selectionChanged( TQListViewItem* )), - this, TQT_SLOT(slotSrcDirTreeSelectionChanged( TQListViewItem* )) ); - connect( m_destDirTree, TQT_SIGNAL(selectionChanged( TQListViewItem* )), - this, TQT_SLOT(slotDestDirTreeSelectionChanged( TQListViewItem* )) ); - connect( m_fileList, TQT_SIGNAL(selectionChanged( TQListViewItem* )), - this, TQT_SLOT(slotFileListSelectionChanged( TQListViewItem* )) ); - connect( m_changesList, TQT_SIGNAL(selectionChanged( TQListViewItem* )), - this, TQT_SLOT(slotChangesListSelectionChanged( TQListViewItem* )) ); + connect( m_srcDirTree, TQ_SIGNAL(selectionChanged( TQListViewItem* )), + this, TQ_SLOT(slotSrcDirTreeSelectionChanged( TQListViewItem* )) ); + connect( m_destDirTree, TQ_SIGNAL(selectionChanged( TQListViewItem* )), + this, TQ_SLOT(slotDestDirTreeSelectionChanged( TQListViewItem* )) ); + connect( m_fileList, TQ_SIGNAL(selectionChanged( TQListViewItem* )), + this, TQ_SLOT(slotFileListSelectionChanged( TQListViewItem* )) ); + connect( m_changesList, TQ_SIGNAL(selectionChanged( TQListViewItem* )), + this, TQ_SLOT(slotChangesListSelectionChanged( TQListViewItem* )) ); } KompareNavTreePart::~KompareNavTreePart() @@ -701,7 +701,7 @@ TDEInstance* KompareNavTreePartFactory::instance() extern "C" { - KDE_EXPORT void* init_libkomparenavtreepart() + TDE_EXPORT void* init_libkomparenavtreepart() { return new KompareNavTreePartFactory; } diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp index 7cc62ef8..dcdad5fa 100644 --- a/kompare/komparepart/kompare_part.cpp +++ b/kompare/komparepart/kompare_part.cpp @@ -32,7 +32,7 @@ #include <tdelocale.h> #include <tdemessagebox.h> #include <kstdaction.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdetempfile.h> #include <tdeparts/genericfactory.h> //#include <ktempdir.h> @@ -72,68 +72,68 @@ KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName, m_diffSettings = new DiffSettings( 0 ); } - readProperties( kapp->config() ); + readProperties( tdeApp->config() ); // This creates the "Model creator" and connects the signals and slots m_modelList = new Diff2::KompareModelList( m_diffSettings, m_info, this, "komparemodellist" ); - connect( m_modelList, TQT_SIGNAL(status( Kompare::Status )), - this, TQT_SLOT(slotSetStatus( Kompare::Status )) ); - connect( m_modelList, TQT_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )), - this, TQT_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )) ); - connect( m_modelList, TQT_SIGNAL(error( TQString )), - this, TQT_SLOT(slotShowError( TQString )) ); - connect( m_modelList, TQT_SIGNAL(applyAllDifferences( bool )), - this, TQT_SLOT(updateActions()) ); - connect( m_modelList, TQT_SIGNAL(applyDifference( bool )), - this, TQT_SLOT(updateActions()) ); - connect( m_modelList, TQT_SIGNAL(applyAllDifferences( bool )), - this, TQT_SIGNAL(appliedChanged()) ); - connect( m_modelList, TQT_SIGNAL(applyDifference( bool )), - this, TQT_SIGNAL(appliedChanged()) ); - - connect( m_modelList, TQT_SIGNAL( setModified( bool ) ), - this, TQT_SLOT( slotSetModified( bool ) ) ); + connect( m_modelList, TQ_SIGNAL(status( Kompare::Status )), + this, TQ_SLOT(slotSetStatus( Kompare::Status )) ); + connect( m_modelList, TQ_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )), + this, TQ_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )) ); + connect( m_modelList, TQ_SIGNAL(error( TQString )), + this, TQ_SLOT(slotShowError( TQString )) ); + connect( m_modelList, TQ_SIGNAL(applyAllDifferences( bool )), + this, TQ_SLOT(updateActions()) ); + connect( m_modelList, TQ_SIGNAL(applyDifference( bool )), + this, TQ_SLOT(updateActions()) ); + connect( m_modelList, TQ_SIGNAL(applyAllDifferences( bool )), + this, TQ_SIGNAL(appliedChanged()) ); + connect( m_modelList, TQ_SIGNAL(applyDifference( bool )), + this, TQ_SIGNAL(appliedChanged()) ); + + connect( m_modelList, TQ_SIGNAL( setModified( bool ) ), + this, TQ_SLOT( slotSetModified( bool ) ) ); // This is the stuff to connect the "interface" of the kompare part to the model inside - connect( m_modelList, TQT_SIGNAL(modelsChanged(const Diff2::DiffModelList*)), - this, TQT_SIGNAL(modelsChanged(const Diff2::DiffModelList*)) ); - - connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)), - this, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)) ); - connect( this, TQT_SIGNAL(selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)), - m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)) ); - - connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::Difference*)), - this, TQT_SIGNAL(setSelection(const Diff2::Difference*)) ); - connect( this, TQT_SIGNAL(selectionChanged(const Diff2::Difference*)), - m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::Difference*)) ); - - connect( m_modelList, TQT_SIGNAL(applyDifference(bool)), - this, TQT_SIGNAL(applyDifference(bool)) ); - connect( m_modelList, TQT_SIGNAL(applyAllDifferences(bool)), - this, TQT_SIGNAL(applyAllDifferences(bool)) ); - connect( m_modelList, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)), - this, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)) ); + connect( m_modelList, TQ_SIGNAL(modelsChanged(const Diff2::DiffModelList*)), + this, TQ_SIGNAL(modelsChanged(const Diff2::DiffModelList*)) ); + + connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)), + this, TQ_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)) ); + connect( this, TQ_SIGNAL(selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)), + m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)) ); + + connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::Difference*)), + this, TQ_SIGNAL(setSelection(const Diff2::Difference*)) ); + connect( this, TQ_SIGNAL(selectionChanged(const Diff2::Difference*)), + m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::Difference*)) ); + + connect( m_modelList, TQ_SIGNAL(applyDifference(bool)), + this, TQ_SIGNAL(applyDifference(bool)) ); + connect( m_modelList, TQ_SIGNAL(applyAllDifferences(bool)), + this, TQ_SIGNAL(applyAllDifferences(bool)) ); + connect( m_modelList, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)), + this, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)) ); // This creates the splitterwidget and connects the signals and slots m_splitter = new KompareSplitter ( m_viewSettings, parentWidget, widgetName ); - connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)), - m_splitter, TQT_SLOT(slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*)) ); -// connect( m_splitter, TQT_SIGNAL(selectionChanged(const Diff2::Difference*, const Diff2::Difference*)), -// m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::Difference*, const Diff2::Difference*)) ); - connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::Difference*)), - m_splitter, TQT_SLOT(slotSetSelection(const Diff2::Difference*)) ); - connect( m_splitter, TQT_SIGNAL(selectionChanged(const Diff2::Difference*)), - m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::Difference*)) ); - - connect( m_modelList, TQT_SIGNAL(applyDifference(bool)), - m_splitter, TQT_SLOT(slotApplyDifference(bool)) ); - connect( m_modelList, TQT_SIGNAL(applyAllDifferences(bool)), - m_splitter, TQT_SLOT(slotApplyAllDifferences(bool)) ); - connect( m_modelList, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)), - m_splitter, TQT_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) ); - connect( this, TQT_SIGNAL(configChanged()), m_splitter, TQT_SIGNAL(configChanged()) ); + connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)), + m_splitter, TQ_SLOT(slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*)) ); +// connect( m_splitter, TQ_SIGNAL(selectionChanged(const Diff2::Difference*, const Diff2::Difference*)), +// m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::Difference*, const Diff2::Difference*)) ); + connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::Difference*)), + m_splitter, TQ_SLOT(slotSetSelection(const Diff2::Difference*)) ); + connect( m_splitter, TQ_SIGNAL(selectionChanged(const Diff2::Difference*)), + m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::Difference*)) ); + + connect( m_modelList, TQ_SIGNAL(applyDifference(bool)), + m_splitter, TQ_SLOT(slotApplyDifference(bool)) ); + connect( m_modelList, TQ_SIGNAL(applyAllDifferences(bool)), + m_splitter, TQ_SLOT(slotApplyAllDifferences(bool)) ); + connect( m_modelList, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)), + m_splitter, TQ_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) ); + connect( this, TQ_SIGNAL(configChanged()), m_splitter, TQ_SIGNAL(configChanged()) ); // notify the part that this is our internal widget setWidget( m_splitter->parentWidget() ); @@ -163,19 +163,19 @@ void KomparePart::setupActions() // create our actions m_saveAll = new TDEAction( i18n("Save &All"), "save_all", 0, - this, TQT_SLOT(saveAll()), + this, TQ_SLOT(saveAll()), actionCollection(), "file_save_all" ); m_saveDiff = new TDEAction( i18n("Save .&diff..."), 0, - this, TQT_SLOT(saveDiff()), + this, TQ_SLOT(saveDiff()), actionCollection(), "file_save_diff" ); m_swap = new TDEAction( i18n( "Swap Source with Destination" ), 0, - this, TQT_SLOT(slotSwap()), + this, TQ_SLOT(slotSwap()), actionCollection(), "file_swap" ); m_diffStats = new TDEAction( i18n( "Show Statistics" ), 0, - this, TQT_SLOT(slotShowDiffstats()), + this, TQ_SLOT(slotShowDiffstats()), actionCollection(), "file_diffstats" ); - KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection()); } void KomparePart::updateActions() @@ -742,7 +742,7 @@ void KomparePart::optionsPreferences() // show preferences KomparePrefDlg* pref = new KomparePrefDlg( m_viewSettings, m_diffSettings ); - connect( pref, TQT_SIGNAL(applyClicked()), this, TQT_SIGNAL(configChanged()) ); + connect( pref, TQ_SIGNAL(applyClicked()), this, TQ_SIGNAL(configChanged()) ); if ( pref->exec() ) emit configChanged(); diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp index 35b40f2e..b15849e4 100644 --- a/kompare/komparepart/kompareconnectwidget.cpp +++ b/kompare/komparepart/kompareconnectwidget.cpp @@ -109,7 +109,7 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi m_selectedModel( 0 ), m_selectedDifference( 0 ) { -// connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) ); +// connect( m_settings, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotDelayedRepaint() ) ); setBackgroundMode( NoBackground ); setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) ); setFocusProxy( parent->parentWidget() ); @@ -139,7 +139,7 @@ void KompareConnectWidget::slotSetSelection( const DiffModel* model, const Diffe void KompareConnectWidget::slotDelayedRepaint() { - TQTimer::singleShot( 0, this, TQT_SLOT( repaint() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( repaint() ) ); } void KompareConnectWidget::slotSetSelection( const Difference* diff ) diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp index 63ac3787..cf40b8e5 100644 --- a/kompare/komparepart/komparelistview.cpp +++ b/kompare/komparepart/komparelistview.cpp @@ -68,12 +68,12 @@ KompareListViewFrame::KompareListViewFrame( bool isSource, m_layout.addWidget(bottomLine); m_layout.addWidget(&m_view); - connect( &m_view, TQT_SIGNAL(differenceClicked(const Diff2::Difference*)), - parent, TQT_SLOT(slotDifferenceClicked(const Diff2::Difference*)) ); + connect( &m_view, TQ_SIGNAL(differenceClicked(const Diff2::Difference*)), + parent, TQ_SLOT(slotDifferenceClicked(const Diff2::Difference*)) ); - connect( parent, TQT_SIGNAL(scrollViewsToId(int)), &m_view, TQT_SLOT(scrollToId(int)) ); - connect( parent, TQT_SIGNAL(setXOffset(int)), &m_view, TQT_SLOT(setXOffset(int)) ); - connect( &m_view, TQT_SIGNAL(resized()), parent, TQT_SLOT(slotUpdateScrollBars()) ); + connect( parent, TQ_SIGNAL(scrollViewsToId(int)), &m_view, TQ_SLOT(scrollToId(int)) ); + connect( parent, TQ_SIGNAL(setXOffset(int)), &m_view, TQ_SLOT(setXOffset(int)) ); + connect( &m_view, TQ_SIGNAL(resized()), parent, TQ_SLOT(slotUpdateScrollBars()) ); } void KompareListViewFrame::slotSetModel( const DiffModel* model ) diff --git a/kompare/komparepart/komparesaveoptionswidget.cpp b/kompare/komparepart/komparesaveoptionswidget.cpp index 95a641cb..84d2ba51 100644 --- a/kompare/komparepart/komparesaveoptionswidget.cpp +++ b/kompare/komparepart/komparesaveoptionswidget.cpp @@ -58,23 +58,23 @@ KompareSaveOptionsWidget::KompareSaveOptionsWidget( TQString source, TQString de m_directoryRequester->setURL( root.url() ); } - connect( m_SmallerChangesCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_LargeFilesCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_IgnoreCaseCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_ExpandTabsCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_IgnoreEmptyLinesCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_IgnoreWhiteSpaceCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_FunctionNamesCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_RecursiveCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_NewFilesCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_ContextRB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_EdRB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_NormalRB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_RCSRB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_UnifiedRB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_SideBySideRB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) ); - connect( m_ContextLinesSB, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateCommandLine()) ); - connect( m_directoryRequester, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCommandLine()) ); + connect( m_SmallerChangesCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_LargeFilesCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_IgnoreCaseCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_ExpandTabsCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_IgnoreEmptyLinesCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_IgnoreWhiteSpaceCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_FunctionNamesCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_RecursiveCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_NewFilesCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_ContextRB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_EdRB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_NormalRB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_RCSRB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_UnifiedRB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_SideBySideRB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) ); + connect( m_ContextLinesSB, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(updateCommandLine()) ); + connect( m_directoryRequester, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateCommandLine()) ); loadOptions(); } diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp index 6300837e..b689b383 100644 --- a/kompare/komparepart/komparesplitter.cpp +++ b/kompare/komparepart/komparesplitter.cpp @@ -66,23 +66,23 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent, setOpaqueResize( true ); setFocusPolicy( TQWidget::WheelFocus ); - connect( this, TQT_SIGNAL(configChanged()), TQT_SLOT(slotConfigChanged()) ); - connect( this, TQT_SIGNAL(configChanged()), TQT_SLOT(slotDelayedRepaintHandles()) ); - connect( this, TQT_SIGNAL(configChanged()), TQT_SLOT(slotDelayedUpdateScrollBars()) ); + connect( this, TQ_SIGNAL(configChanged()), TQ_SLOT(slotConfigChanged()) ); + connect( this, TQ_SIGNAL(configChanged()), TQ_SLOT(slotDelayedRepaintHandles()) ); + connect( this, TQ_SIGNAL(configChanged()), TQ_SLOT(slotDelayedUpdateScrollBars()) ); // scrolling - connect( m_vScroll, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollToId(int)) ); - connect( m_vScroll, TQT_SIGNAL(sliderMoved(int)), TQT_SLOT(scrollToId(int)) ); - connect( m_hScroll, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(setXOffset(int)) ); - connect( m_hScroll, TQT_SIGNAL(sliderMoved(int)), TQT_SIGNAL(setXOffset(int)) ); + connect( m_vScroll, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(scrollToId(int)) ); + connect( m_vScroll, TQ_SIGNAL(sliderMoved(int)), TQ_SLOT(scrollToId(int)) ); + connect( m_hScroll, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(setXOffset(int)) ); + connect( m_hScroll, TQ_SIGNAL(sliderMoved(int)), TQ_SIGNAL(setXOffset(int)) ); m_scrollTimer=new TQTimer(); restartTimer = false; - connect (m_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timerTimeout()) ); + connect (m_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timerTimeout()) ); // we need to receive childEvents now so that d->list is ready for when // slotSetSelection(...) arrives - kapp->sendPostedEvents(this, TQEvent::ChildInserted); + tdeApp->sendPostedEvents(this, TQEvent::ChildInserted); // init stuff slotUpdateScrollBars(); @@ -92,11 +92,11 @@ KompareSplitter::~KompareSplitter(){} /* Inserts the widget \a w at the end (or at the beginning if \a - prepend is TRUE) of the splitter's list of widgets. + prepend is true) of the splitter's list of widgets. It is the responsibility of the caller to make sure that \a w is not already in the splitter and to call recalcId() if needed. (If - \a prepend is TRUE, then recalcId() is very probably needed.) + \a prepend is true, then recalcId() is very probably needed.) */ TQSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, bool prepend ) @@ -120,7 +120,7 @@ TQSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, boo newHandle = new KompareConnectWidgetFrame(lw, rw, m_settings, this, tmp.latin1()); s->wid = newHandle; newHandle->setId( d->list.count() ); - s->isHandle = TRUE; + s->isHandle = true; s->sizer = pick( newHandle->sizeHint() ); if ( prepend ) d->list.prepend( s ); @@ -130,7 +130,7 @@ TQSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, boo s = new TQSplitterLayoutStruct; s->resizeMode = DefaultResizeMode; s->wid = w; - s->isHandle = FALSE; + s->isHandle = false; if ( prepend ) d->list.prepend( s ); else d->list.append( s ); if ( newHandle && isVisible() ) @@ -231,12 +231,12 @@ void KompareSplitter::moveSplitter( TQCOORD p, int id ) bool upLeft; if ( TQApplication::reverseLayout() && orient ==TQt::Horizontal ) { int q = p + s->wid->width(); - doMove( FALSE, q, id - 1, -1, (p > max), poss, ws ); - doMove( TRUE, q, id, -1, (p < min), poss, ws ); + doMove( false, q, id - 1, -1, (p > max), poss, ws ); + doMove( true, q, id, -1, (p < min), poss, ws ); upLeft = (q > oldP); } else { - doMove( FALSE, p, id, +1, (p > max), poss, ws ); - doMove( TRUE, p, id - 1, +1, (p < min), poss, ws ); + doMove( false, p, id, +1, (p > max), poss, ws ); + doMove( true, p, id - 1, +1, (p < min), poss, ws ); upLeft = (p < oldP); } if ( upLeft ) { @@ -244,13 +244,13 @@ void KompareSplitter::moveSplitter( TQCOORD p, int id ) for ( int id = 0; id < count; ++id ) { w = d->list.at( id )->wid; if( !w->isHidden() ) - setGeo( w, poss[id], ws[id], TRUE ); + setGeo( w, poss[id], ws[id], true ); } } else { for ( int id = d->list.count() - 1; id >= 0; --id ) { w = d->list.at( id )->wid; if( !w->isHidden() ) - setGeo( w, poss[id], ws[id], TRUE ); + setGeo( w, poss[id], ws[id], true ); } } storeSizes(); @@ -266,7 +266,7 @@ void KompareSplitter::doMove( bool backwards, int pos, int id, int delta, s = d->list.at( id ); w = s->wid; if ( w->isHidden() ) { - mayCollapse = TRUE; + mayCollapse = true; } else { if ( s->isHandle ) { int dd = s->getSizer( orient ); @@ -286,7 +286,7 @@ void KompareSplitter::doMove( bool backwards, int pos, int id, int delta, positions[id] = backwards ? pos - dd : pos; widths[id] = dd; pos = backwards ? pos - dd : pos + dd; - mayCollapse = TRUE; + mayCollapse = true; } } } @@ -502,7 +502,7 @@ void KompareSplitter::scrollToId( int id ) void KompareSplitter::slotDelayedUpdateScrollBars() { - TQTimer::singleShot( 0, this, TQT_SLOT( slotUpdateScrollBars() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotUpdateScrollBars() ) ); } void KompareSplitter::slotUpdateScrollBars() @@ -543,7 +543,7 @@ void KompareSplitter::slotUpdateScrollBars() void KompareSplitter::slotDelayedUpdateVScrollValue() { - TQTimer::singleShot( 0, this, TQT_SLOT( slotUpdateVScrollValue() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( slotUpdateVScrollValue() ) ); } void KompareSplitter::slotUpdateVScrollValue() diff --git a/kompare/komparepart/komparesplitter.h b/kompare/komparepart/komparesplitter.h index 6b672596..74677dbc 100644 --- a/kompare/komparepart/komparesplitter.h +++ b/kompare/komparepart/komparesplitter.h @@ -84,7 +84,7 @@ private slots: private: TQSplitterLayoutStruct *addWidget(KompareListViewFrame *w, - bool prepend = FALSE ); + bool prepend = false ); void doMove( bool backwards, int pos, int id, int delta, bool mayCollapse, int* positions, int* widths ); diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp index 363179ee..69db4b2b 100644 --- a/kompare/kompareurldialog.cpp +++ b/kompare/kompareurldialog.cpp @@ -37,7 +37,7 @@ KompareURLDialog::KompareURLDialog( TQWidget *parent, const char *name ) { setIconListAllVisible(true); - TDEConfig* cfg = kapp->config(); + TDEConfig* cfg = tdeApp->config(); TQVBox* filesBox = addVBoxPage( i18n( "Files" ), i18n( "Here you can enter the files you want to compare." ) ); m_filesPage = new FilesPage( filesBox ); m_filesSettings = new FilesSettings( this ); @@ -60,10 +60,10 @@ KompareURLDialog::KompareURLDialog( TQWidget *parent, const char *name ) enableButtonSeparator( true ); - connect( m_filesPage->firstURLRequester(), TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEnableOk() ) ); - connect( m_filesPage->secondURLRequester(), TQT_SIGNAL( textChanged( const TQString& ) ), - this, TQT_SLOT( slotEnableOk() ) ); + connect( m_filesPage->firstURLRequester(), TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEnableOk() ) ); + connect( m_filesPage->secondURLRequester(), TQ_SIGNAL( textChanged( const TQString& ) ), + this, TQ_SLOT( slotEnableOk() ) ); slotEnableOk(); } @@ -76,7 +76,7 @@ void KompareURLDialog::slotOk() { m_filesPage->setURLsInComboBoxes(); - TDEConfig* cfg = kapp->config(); + TDEConfig* cfg = tdeApp->config(); m_filesPage->apply(); m_diffPage->apply(); @@ -125,7 +125,7 @@ void KompareURLDialog::setSecondGroupBoxTitle( const TQString& title ) void KompareURLDialog::setGroup( const TQString& groupName ) { m_filesSettings->setGroup( groupName ); - m_filesSettings->loadSettings( kapp->config() ); + m_filesSettings->loadSettings( tdeApp->config() ); m_filesPage->setSettings( m_filesSettings ); } diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp index 5111346e..39e7a1c8 100644 --- a/kompare/libdialogpages/diffpage.cpp +++ b/kompare/libdialogpages/diffpage.cpp @@ -130,7 +130,7 @@ void DiffPage::apply() m_settings->m_excludeFilesFileURL = m_excludeFileURLComboBox->currentText(); m_settings->m_excludeFilesFileHistoryList = m_excludeFileURLComboBox->urls(); - m_settings->saveSettings( kapp->config() ); + m_settings->saveSettings( tdeApp->config() ); } void DiffPage::setDefaults() @@ -160,7 +160,7 @@ void DiffPage::setDefaults() void DiffPage::slotShowRegExpEditor() { if ( ! m_ignoreRegExpDialog ) - m_ignoreRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), TQT_TQOBJECT(this) ); + m_ignoreRegExpDialog = KParts::ComponentFactory::createInstanceFromQuery<TQDialog>( "KRegExpEditor/KRegExpEditor", TQString(), this ); KRegExpEditorInterface *iface = static_cast<KRegExpEditorInterface *>( m_ignoreRegExpDialog->tqt_cast( "KRegExpEditorInterface" ) ); @@ -294,7 +294,7 @@ void DiffPage::addOptionsTab() TQButton* ignoreRegExpEditButton = new TQPushButton( i18n( "&Edit..." ), page, "regexp_editor_button" ); TQToolTip::add( ignoreRegExpEditButton, i18n( "Clicking this will open a regular expression dialog where\nyou can graphically create regular expressions." ) ); groupLayout->addWidget( ignoreRegExpEditButton ); - connect( ignoreRegExpEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowRegExpEditor() ) ); + connect( ignoreRegExpEditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowRegExpEditor() ) ); } TQVButtonGroup* moreOptionButtonGroup = new TQVButtonGroup( i18n( "Whitespace" ), page ); @@ -333,7 +333,7 @@ void DiffPage::addExcludeTab() layout->addWidget( excludeFilePatternGroupBox ); - connect( m_excludeFilePatternCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFilePatternToggled(bool))); + connect( m_excludeFilePatternCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotExcludeFilePatternToggled(bool))); TQHGroupBox* excludeFileNameGroupBox = new TQHGroupBox( i18n( "File with Filenames to Exclude" ), page ); m_excludeFileCheckBox = new TQCheckBox( "", excludeFileNameGroupBox ); @@ -344,7 +344,7 @@ void DiffPage::addExcludeTab() TQToolTip::add( m_excludeFileURLRequester, i18n( "Any file you select in the dialog that pops up when you click it will be put in the dialog to the left of this button." ) ); layout->addWidget( excludeFileNameGroupBox ); - connect( m_excludeFileCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFileToggled(bool))); + connect( m_excludeFileCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotExcludeFileToggled(bool))); layout->addStretch( 1 ); page->setMinimumSize( sizeHintForWidget( page ) ); diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp index c8819b24..34661708 100644 --- a/kompare/libdialogpages/filespage.cpp +++ b/kompare/libdialogpages/filespage.cpp @@ -47,8 +47,8 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal m_secondURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_secondGB, "DestURLComboBox" ); m_secondURLRequester = new KURLRequester( m_secondURLComboBox, m_secondGB ); - connect( m_firstURLRequester, TQT_SIGNAL( urlSelected( const TQString & ) ), TQT_SLOT( setSecondURL( const TQString & ) ) ); - connect( m_secondURLRequester, TQT_SIGNAL( urlSelected( const TQString & ) ), TQT_SLOT( setFirstURL( const TQString & ) ) ); + connect( m_firstURLRequester, TQ_SIGNAL( urlSelected( const TQString & ) ), TQ_SLOT( setSecondURL( const TQString & ) ) ); + connect( m_secondURLRequester, TQ_SIGNAL( urlSelected( const TQString & ) ), TQ_SLOT( setFirstURL( const TQString & ) ) ); m_thirdGB = new TQGroupBox( 1, TQt::Vertical, i18n( "Encoding" ), page ); m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" ); diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp index 9a410f35..26797268 100644 --- a/kompare/libdialogpages/viewpage.cpp +++ b/kompare/libdialogpages/viewpage.cpp @@ -160,7 +160,7 @@ void ViewPage::apply() m_settings->m_font = TQFont( m_fontCombo->currentFont() ); m_settings->m_font.setPointSize( m_fontSizeSpinBox->value() ); - m_settings->saveSettings( kapp->config() ); + m_settings->saveSettings( tdeApp->config() ); } void ViewPage::setDefaults() diff --git a/kompare/libdiff2/cvsdiffparser.cpp b/kompare/libdiff2/cvsdiffparser.cpp index 47c79a0f..4a092a42 100644 --- a/kompare/libdiff2/cvsdiffparser.cpp +++ b/kompare/libdiff2/cvsdiffparser.cpp @@ -99,7 +99,7 @@ bool CVSDiffParser::parseNormalDiffHeader() kdDebug(8101) << "Matched string Header = " << m_normalDiffHeader.cap( 0 ) << endl; m_currentModel = new DiffModel(); - TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) ); + TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) ); m_currentModel->setSourceFile ( m_normalDiffHeader.cap( 1 ) ); m_currentModel->setDestinationFile ( m_normalDiffHeader.cap( 1 ) ); @@ -120,7 +120,7 @@ bool CVSDiffParser::parseNormalDiffHeader() // Set this to the first line again and hope it is a single file diff m_diffIterator = m_diffLines.begin(); m_currentModel = new DiffModel(); - TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) ); + TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) ); m_singleFileDiff = true; } diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp index 7691536c..558f80c6 100644 --- a/kompare/libdiff2/komparemodellist.cpp +++ b/kompare/libdiff2/komparemodellist.cpp @@ -59,33 +59,33 @@ KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare:: m_textCodec( 0 ) { m_applyDifference = new TDEAction( i18n("&Apply Difference"), "1rightarrow", TQt::Key_Space, - this, TQT_SLOT(slotActionApplyDifference()), + this, TQ_SLOT(slotActionApplyDifference()), (( KomparePart* )parent)->actionCollection(), "difference_apply" ); m_unApplyDifference = new TDEAction( i18n("Un&apply Difference"), "1leftarrow", TQt::Key_BackSpace, - this, TQT_SLOT(slotActionUnApplyDifference()), + this, TQ_SLOT(slotActionUnApplyDifference()), (( KomparePart* )parent)->actionCollection(), "difference_unapply" ); m_applyAll = new TDEAction( i18n("App&ly All"), "2rightarrow", TQt::CTRL + TQt::Key_A, - this, TQT_SLOT(slotActionApplyAllDifferences()), + this, TQ_SLOT(slotActionApplyAllDifferences()), (( KomparePart* )parent)->actionCollection(), "difference_applyall" ); m_unapplyAll = new TDEAction( i18n("&Unapply All"), "2leftarrow", TQt::CTRL + TQt::Key_U, - this, TQT_SLOT(slotActionUnapplyAllDifferences()), + this, TQ_SLOT(slotActionUnapplyAllDifferences()), (( KomparePart* )parent)->actionCollection(), "difference_unapplyall" ); m_previousFile = new TDEAction( i18n("P&revious File"), "2uparrow", TQt::CTRL + TQt::Key_PageUp, - this, TQT_SLOT(slotPreviousModel()), + this, TQ_SLOT(slotPreviousModel()), (( KomparePart* )parent)->actionCollection(), "difference_previousfile" ); m_nextFile = new TDEAction( i18n("N&ext File"), "2downarrow", TQt::CTRL + TQt::Key_PageDown, - this, TQT_SLOT(slotNextModel()), + this, TQ_SLOT(slotNextModel()), (( KomparePart* )parent)->actionCollection(), "difference_nextfile" ); m_previousDifference = new TDEAction( i18n("&Previous Difference"), "1uparrow", TQt::CTRL + TQt::Key_Up, - this, TQT_SLOT(slotPreviousDifference()), + this, TQ_SLOT(slotPreviousDifference()), (( KomparePart* )parent)->actionCollection(), "difference_previous" ); m_nextDifference = new TDEAction( i18n("&Next Difference"), "1downarrow", TQt::CTRL + TQt::Key_Down, - this, TQT_SLOT(slotNextDifference()), + this, TQ_SLOT(slotNextDifference()), (( KomparePart* )parent)->actionCollection(), "difference_next" ); m_previousDifference->setEnabled( false ); m_nextDifference->setEnabled( false ); - m_save = KStdAction::save( this, TQT_SLOT(slotSaveDestination()), ((KomparePart*)parent)->actionCollection() ); + m_save = KStdAction::save( this, TQ_SLOT(slotSaveDestination()), ((KomparePart*)parent)->actionCollection() ); m_save->setEnabled( false ); updateModelListActions(); @@ -183,16 +183,16 @@ bool KompareModelList::compareFiles( const TQString& source, const TQString& des // m_fileWatch->addFile( m_source ); // m_fileWatch->addFile( m_destination ); -// connect( m_fileWatch, TQT_SIGNAL( dirty( const TQString& ) ), this, TQT_SLOT( slotFileChanged( const TQString& ) ) ); -// connect( m_fileWatch, TQT_SIGNAL( created( const TQString& ) ), this, TQT_SLOT( slotFileChanged( const TQString& ) ) ); -// connect( m_fileWatch, TQT_SIGNAL( deleted( const TQString& ) ), this, TQT_SLOT( slotFileChanged( const TQString& ) ) ); +// connect( m_fileWatch, TQ_SIGNAL( dirty( const TQString& ) ), this, TQ_SLOT( slotFileChanged( const TQString& ) ) ); +// connect( m_fileWatch, TQ_SIGNAL( created( const TQString& ) ), this, TQ_SLOT( slotFileChanged( const TQString& ) ) ); +// connect( m_fileWatch, TQ_SIGNAL( deleted( const TQString& ) ), this, TQ_SLOT( slotFileChanged( const TQString& ) ) ); // m_fileWatch->startScan(); m_diffProcess = new KompareProcess( m_diffSettings, Kompare::Custom, m_source, m_destination ); m_diffProcess->setEncoding( m_encoding ); - connect( m_diffProcess, TQT_SIGNAL(diffHasFinished( bool )), - this, TQT_SLOT(slotDiffProcessFinished( bool )) ); + connect( m_diffProcess, TQ_SIGNAL(diffHasFinished( bool )), + this, TQ_SLOT(slotDiffProcessFinished( bool )) ); emit status( Kompare::RunningDiff ); m_diffProcess->start(); @@ -212,16 +212,16 @@ bool KompareModelList::compareDirs( const TQString& source, const TQString& dest // m_dirWatch->addDir( m_source, true, true ); // m_dirWatch->addDir( m_destination, true, true ); -// connect( m_dirWatch, TQT_SIGNAL( dirty ( const TQString& ) ), this, TQT_SLOT( slotDirectoryChanged( const TQString& ) ) ); -// connect( m_dirWatch, TQT_SIGNAL( created( const TQString& ) ), this, TQT_SLOT( slotDirectoryChanged( const TQString& ) ) ); -// connect( m_dirWatch, TQT_SIGNAL( deleted( const TQString& ) ), this, TQT_SLOT( slotDirectoryChanged( const TQString& ) ) ); +// connect( m_dirWatch, TQ_SIGNAL( dirty ( const TQString& ) ), this, TQ_SLOT( slotDirectoryChanged( const TQString& ) ) ); +// connect( m_dirWatch, TQ_SIGNAL( created( const TQString& ) ), this, TQ_SLOT( slotDirectoryChanged( const TQString& ) ) ); +// connect( m_dirWatch, TQ_SIGNAL( deleted( const TQString& ) ), this, TQ_SLOT( slotDirectoryChanged( const TQString& ) ) ); // m_dirWatch->startScan(); m_diffProcess = new KompareProcess( m_diffSettings, Kompare::Custom, m_source, m_destination ); m_diffProcess->setEncoding( m_encoding ); - connect( m_diffProcess, TQT_SIGNAL(diffHasFinished( bool )), - this, TQT_SLOT(slotDiffProcessFinished( bool )) ); + connect( m_diffProcess, TQ_SIGNAL(diffHasFinished( bool )), + this, TQ_SLOT(slotDiffProcessFinished( bool )) ); emit status( Kompare::RunningDiff ); m_diffProcess->start(); @@ -589,8 +589,8 @@ bool KompareModelList::saveDiff( const TQString& url, TQString directory, DiffSe m_diffProcess = new KompareProcess( diffSettings, Kompare::Custom, m_source, m_destination, directory ); m_diffProcess->setEncoding( m_encoding ); - connect( m_diffProcess, TQT_SIGNAL(diffHasFinished( bool )), - this, TQT_SLOT(slotWriteDiffOutput( bool )) ); + connect( m_diffProcess, TQ_SIGNAL(diffHasFinished( bool )), + this, TQ_SLOT(slotWriteDiffOutput( bool )) ); emit status( Kompare::RunningDiff ); return m_diffProcess->start(); diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp index 08913d7c..f8515748 100644 --- a/kompare/libdiff2/kompareprocess.cpp +++ b/kompare/libdiff2/kompareprocess.cpp @@ -39,14 +39,14 @@ KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMo setUseShell( true ); // connect the stdout and stderr signals - connect( this, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), - TQT_SLOT ( slotReceivedStdout( TDEProcess*, char*, int ) ) ); - connect( this, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), - TQT_SLOT ( slotReceivedStderr( TDEProcess*, char*, int ) ) ); + connect( this, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ), + TQ_SLOT ( slotReceivedStdout( TDEProcess*, char*, int ) ) ); + connect( this, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ), + TQ_SLOT ( slotReceivedStderr( TDEProcess*, char*, int ) ) ); // connect the signal that indicates that the proces has exited - connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ), - TQT_SLOT ( slotProcessExited( TDEProcess* ) ) ); + connect( this, TQ_SIGNAL( processExited( TDEProcess* ) ), + TQ_SLOT ( slotProcessExited( TDEProcess* ) ) ); *this << "LANG=C"; diff --git a/kompare/libdiff2/kompareprocess.h b/kompare/libdiff2/kompareprocess.h index 9b68f99d..ad9ebf16 100644 --- a/kompare/libdiff2/kompareprocess.h +++ b/kompare/libdiff2/kompareprocess.h @@ -20,7 +20,7 @@ #ifndef KOMPAREPROCESS_H #define KOMPAREPROCESS_H -#include <kprocess.h> +#include <tdeprocess.h> #include "kompare.h" diff --git a/kompare/libdiff2/parserbase.cpp b/kompare/libdiff2/parserbase.cpp index 8a503019..42ac5c8c 100644 --- a/kompare/libdiff2/parserbase.cpp +++ b/kompare/libdiff2/parserbase.cpp @@ -122,7 +122,7 @@ bool ParserBase::parseContextDiffHeader() // kdDebug(8101) << "Matched string Header2 = " << m_contextDiffHeader2.cap( 0 ) << endl; m_currentModel = new DiffModel( m_contextDiffHeader1.cap( 1 ), m_contextDiffHeader2.cap( 1 ) ); - TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) ); + TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) ); m_currentModel->setSourceTimestamp ( m_contextDiffHeader1.cap( 2 ) ); m_currentModel->setSourceRevision ( m_contextDiffHeader1.cap( 4 ) ); m_currentModel->setDestinationTimestamp( m_contextDiffHeader2.cap( 2 ) ); @@ -164,7 +164,7 @@ bool ParserBase::parseNormalDiffHeader() // kdDebug(8101) << "Matched string Header = " << m_normalDiffHeader.cap( 0 ) << endl; m_currentModel = new DiffModel(); - TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) ); + TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) ); m_currentModel->setSourceFile ( m_normalDiffHeader.cap( 1 ) ); m_currentModel->setDestinationFile ( m_normalDiffHeader.cap( 2 ) ); @@ -185,7 +185,7 @@ bool ParserBase::parseNormalDiffHeader() // Set this to the first line again and hope it is a single file diff m_diffIterator = m_diffLines.begin(); m_currentModel = new DiffModel(); - TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) ); + TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) ); m_singleFileDiff = true; } @@ -215,7 +215,7 @@ bool ParserBase::parseUnifiedDiffHeader() if ( m_diffIterator != m_diffLines.end() && m_unifiedDiffHeader2.exactMatch( *m_diffIterator ) ) { m_currentModel = new DiffModel( m_unifiedDiffHeader1.cap( 1 ), m_unifiedDiffHeader2.cap( 1 ) ); - TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) ); + TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) ); m_currentModel->setSourceTimestamp( m_unifiedDiffHeader1.cap( 2 ) ); m_currentModel->setSourceRevision( m_unifiedDiffHeader1.cap( 4 ) ); m_currentModel->setDestinationTimestamp( m_unifiedDiffHeader2.cap( 2 ) ); diff --git a/kompare/main.cpp b/kompare/main.cpp index 8f8a378a..3ea67a81 100644 --- a/kompare/main.cpp +++ b/kompare/main.cpp @@ -210,5 +210,5 @@ int main(int argc, char *argv[]) args->clear(); } - return kapp->exec(); + return tdeApp->exec(); } diff --git a/kspy/navview.cpp b/kspy/navview.cpp index 43ba8407..f1a628d9 100644 --- a/kspy/navview.cpp +++ b/kspy/navview.cpp @@ -32,8 +32,8 @@ NavView::NavView(TQWidget *parent, const char *name ) : TDEListView(parent,name) setAllColumnsShowFocus( true ); setFullWidth( true ); - connect( this, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ), - this, TQT_SLOT( selectItem( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ), + this, TQ_SLOT( selectItem( TQListViewItem * ) ) ); } NavView::~NavView(){ diff --git a/kspy/receiversview.cpp b/kspy/receiversview.cpp index bb5505e5..058cb3e3 100644 --- a/kspy/receiversview.cpp +++ b/kspy/receiversview.cpp @@ -64,7 +64,7 @@ void ReceiversView::buildList( TQObject *o ) { new TDEListViewItem( conn, connection->object()->name(), - connection->memberType() == 1 ? "SLOT" : "SIGNAL", + connection->memberType() == 1 ? "TQ_SLOT" : "TQ_SIGNAL", connection->memberName() ); } } diff --git a/kspy/spy.cpp b/kspy/spy.cpp index 24ebaf4f..3731ecab 100644 --- a/kspy/spy.cpp +++ b/kspy/spy.cpp @@ -34,7 +34,7 @@ extern "C" { - KDE_EXPORT void* init_libkspy() + TDE_EXPORT void* init_libkspy() { tqWarning( "KSpy: Initialising...\n" ); Spy *s = new Spy(); @@ -74,14 +74,14 @@ Spy::Spy( TQWidget *parent, const char *name ) mNavView->buildTree(); - connect( mNavView, TQT_SIGNAL( selected( TQObject * ) ), - mPropsView, TQT_SLOT( setTarget( TQObject * ) ) ); - connect( mNavView, TQT_SIGNAL( selected( TQObject * ) ), - mSigSlotView, TQT_SLOT( setTarget( TQObject * ) ) ); - connect( mNavView, TQT_SIGNAL( selected( TQObject * ) ), - mReceiversView, TQT_SLOT( setTarget( TQObject * ) ) ); - connect( mNavView, TQT_SIGNAL( selected( TQObject * ) ), - mClassInfoView, TQT_SLOT( setTarget( TQObject * ) ) ); + connect( mNavView, TQ_SIGNAL( selected( TQObject * ) ), + mPropsView, TQ_SLOT( setTarget( TQObject * ) ) ); + connect( mNavView, TQ_SIGNAL( selected( TQObject * ) ), + mSigSlotView, TQ_SLOT( setTarget( TQObject * ) ) ); + connect( mNavView, TQ_SIGNAL( selected( TQObject * ) ), + mReceiversView, TQ_SLOT( setTarget( TQObject * ) ) ); + connect( mNavView, TQ_SIGNAL( selected( TQObject * ) ), + mClassInfoView, TQ_SLOT( setTarget( TQObject * ) ) ); } Spy::~Spy() @@ -92,10 +92,10 @@ Spy::~Spy() void Spy::setTarget( TQWidget *target ) { mTarget = target; - mPropsView->buildList( TQT_TQOBJECT(mTarget) ); - mSigSlotView->buildList( TQT_TQOBJECT(mTarget) ); - mReceiversView->buildList( TQT_TQOBJECT(mTarget) ); - mClassInfoView->buildList( TQT_TQOBJECT(mTarget) ); + mPropsView->buildList( mTarget ); + mSigSlotView->buildList( mTarget ); + mReceiversView->buildList( mTarget ); + mClassInfoView->buildList( mTarget ); } void Spy::keyPressEvent( TQKeyEvent *event ) diff --git a/kstartperf/CMakeLists.txt b/kstartperf/CMakeLists.txt index 049eb880..8c6548f2 100644 --- a/kstartperf/CMakeLists.txt +++ b/kstartperf/CMakeLists.txt @@ -24,7 +24,7 @@ link_directories( tde_add_library( kstartperf SHARED AUTOMOC SOURCES libkstartperf.c VERSION 1.0.0 - LINK ${DL_LIBRARIES} + LINK ${CMAKE_DL_LIBS} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kstartperf/kstartperf.cpp b/kstartperf/kstartperf.cpp index 8baf772c..0f633165 100644 --- a/kstartperf/kstartperf.cpp +++ b/kstartperf/kstartperf.cpp @@ -23,7 +23,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> static TDECmdLineOptions options[] = diff --git a/kuiviewer/CMakeLists.txt b/kuiviewer/CMakeLists.txt index 8f2ffef2..44b39bf1 100644 --- a/kuiviewer/CMakeLists.txt +++ b/kuiviewer/CMakeLists.txt @@ -49,7 +49,7 @@ install( FILES tde_add_kpart( libkuiviewerpart AUTOMOC SOURCES kuiviewer_part.cpp - LINK tdetexteditor-shared ${TQTQUI_LIBRARIES} + LINK tdetexteditor-shared ${TQT_LIBRARIES} tqui DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -58,7 +58,7 @@ tde_add_kpart( libkuiviewerpart AUTOMOC tde_add_kpart( quithumbnail SOURCES quicreator.cpp - LINK ${TQTQUI_LIBRARIES} + LINK ${TQT_LIBRARIES} tqui DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kuiviewer/kuiviewer.cpp b/kuiviewer/kuiviewer.cpp index 430afaa0..b72599aa 100644 --- a/kuiviewer/kuiviewer.cpp +++ b/kuiviewer/kuiviewer.cpp @@ -60,7 +60,7 @@ KUIViewer::KUIViewer() { // now that the Part is loaded, we cast it to a Part to get // our hands on it - m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(TQT_TQOBJECT(this), + m_part = static_cast<KParts::ReadOnlyPart *>(factory->create(this, "kuiviewer_part", "KParts::ReadOnlyPart" )); if (m_part) @@ -78,8 +78,8 @@ KUIViewer::KUIViewer() // itself can't do anything useful //FIXME improve message, which Part is this referring to? KMessageBox::error(this, i18n("Unable to locate Kuiviewer kpart.")); - kapp->quit(); - // we return here, cause kapp->quit() only means "exit the + tdeApp->quit(); + // we return here, cause tdeApp->quit() only means "exit the // next time we enter the event loop... return; } @@ -97,8 +97,8 @@ void KUIViewer::load(const KURL& url) void KUIViewer::setupActions() { - KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); - KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); + KStdAction::open(this, TQ_SLOT(fileOpen()), actionCollection()); + KStdAction::quit(tdeApp, TQ_SLOT(quit()), actionCollection()); } void KUIViewer::saveProperties(TDEConfig* /*config*/) diff --git a/kuiviewer/kuiviewer_part.cpp b/kuiviewer/kuiviewer_part.cpp index d2952577..39a8bec1 100644 --- a/kuiviewer/kuiviewer_part.cpp +++ b/kuiviewer/kuiviewer_part.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kdialogbase.h> #include <kiconloader.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeio/netaccess.h> #include <tdelistview.h> #include <tdeparts/genericfactory.h> @@ -72,14 +72,14 @@ KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName, m_style = new TDEListAction( i18n("Style"), CTRL + Key_S, - TQT_TQOBJECT(this), - TQT_SLOT(slotStyle(int)), + this, + TQ_SLOT(slotStyle(int)), actionCollection(), "change_style"); m_style->setEditable(false); - kapp->config()->setGroup("General"); - const TQString currentStyle = kapp->config()->readEntry("currentWidgetStyle", TDEStyle::defaultStyle()); + tdeApp->config()->setGroup("General"); + const TQString currentStyle = tdeApp->config()->readEntry("currentWidgetStyle", TDEStyle::defaultStyle()); const TQStringList styles = TQStyleFactory::keys(); m_style->setItems(styles); @@ -97,14 +97,14 @@ KUIViewerPart::KUIViewerPart( TQWidget *parentWidget, const char *widgetName, m_style->setToolTip(i18n("Set the current style to view.")); m_style->setMenuAccelsEnabled(true); - m_copy = KStdAction::copy(this, TQT_SLOT(slotGrab()), actionCollection()); + m_copy = KStdAction::copy(this, TQ_SLOT(slotGrab()), actionCollection()); updateActions(); // Commented out to fix warning (rich) // slot should probably be called saveAs() for consistency with // KParts::ReadWritePart BTW. -// KStdAction::saveAs(this, TQT_SLOT(slotSave()), actionCollection()); +// KStdAction::saveAs(this, TQ_SLOT(slotSave()), actionCollection()); } KUIViewerPart::~KUIViewerPart() @@ -187,15 +187,15 @@ void KUIViewerPart::slotStyle(int) TQObjectList *l = m_widget->queryList( "TQWidget" ); for ( TQObject *o = l->first(); o; o = l->next() ) - ( TQT_TQWIDGET(o) )->setStyle( style ); + ( static_cast<TQWidget*>(o) )->setStyle( style ); delete l; m_widget->show(); TQApplication::restoreOverrideCursor(); - kapp->config()->setGroup("General"); - kapp->config()->writeEntry("currentWidgetStyle", m_style->currentText()); - kapp->config()->sync(); + tdeApp->config()->setGroup("General"); + tdeApp->config()->writeEntry("currentWidgetStyle", m_style->currentText()); + tdeApp->config()->sync(); } void KUIViewerPart::slotGrab() diff --git a/kuiviewer/quicreator.cpp b/kuiviewer/quicreator.cpp index 0dc6da3e..3336939e 100644 --- a/kuiviewer/quicreator.cpp +++ b/kuiviewer/quicreator.cpp @@ -30,11 +30,11 @@ #include "quicreator.h" -#include <kdemacros.h> +#include <tdemacros.h> extern "C" { - KDE_EXPORT ThumbCreator *new_creator() + TDE_EXPORT ThumbCreator *new_creator() { return new QUICreator; } diff --git a/poxml/antlr/antlr/CharScanner.h b/poxml/antlr/antlr/CharScanner.h index a2537964..ece0b5b3 100644 --- a/poxml/antlr/antlr/CharScanner.h +++ b/poxml/antlr/antlr/CharScanner.h @@ -36,20 +36,21 @@ */ #include <cstdio> +#include <functional> +#include <map> + #include "antlr/config.h" #include "antlr/TokenStream.h" #include "antlr/RecognitionException.h" #include "antlr/InputBuffer.h" #include "antlr/BitSet.h" #include "antlr/LexerSharedInputState.h" -#include <map> -#include <cstdio> ANTLR_BEGIN_NAMESPACE(antlr) class CharScanner; -class CharScannerLiteralsLess : public ANTLR_USE_NAMESPACE(std)binary_function<ANTLR_USE_NAMESPACE(std)string,ANTLR_USE_NAMESPACE(std)string,bool> { +class CharScannerLiteralsLess : public ANTLR_USE_NAMESPACE(std)function<bool(ANTLR_USE_NAMESPACE(std)string,ANTLR_USE_NAMESPACE(std)string)> { private: const CharScanner* scanner; public: diff --git a/poxml/antlr/antlr/config.h b/poxml/antlr/antlr/config.h index 8ac94a3a..6a26ddae 100644 --- a/poxml/antlr/antlr/config.h +++ b/poxml/antlr/antlr/config.h @@ -48,7 +48,6 @@ #define ANTLR_USING_NAMESPACE(_x_) using namespace _x_; #define ANTLR_BEGIN_NAMESPACE(_x_) namespace _x_ { #define ANTLR_END_NAMESPACE } -#define ANTLR_C_USING(_x_) #if defined(_MSC_VER) && !defined(__ICL) // Microsoft Visual C++ @@ -152,17 +151,4 @@ #include <strings.h> #endif -// -// Metrowerks Codewarrior -// -#ifdef __MWERKS__ -#if (__MWERKS__ <= 0x2201) -#define NO_TEMPLATE_PARTS -#define ANTLR_REALLY_NO_STRCASECMP -#endif - -#undef ANTLR_C_USING -#define ANTLR_C_USING(_x_) using std:: ## _x_; -#endif - #endif //INC_config_hpp__ diff --git a/poxml/antlr/src/CharScanner.cpp b/poxml/antlr/src/CharScanner.cpp index 8374651e..bcfb1682 100644 --- a/poxml/antlr/src/CharScanner.cpp +++ b/poxml/antlr/src/CharScanner.cpp @@ -51,30 +51,6 @@ #include <stdlib.h> ANTLR_BEGIN_NAMESPACE(antlr) -ANTLR_C_USING(exit) -ANTLR_C_USING(tolower) - -#ifdef ANTLR_REALLY_NO_STRCASECMP -// Apparently, neither strcasecmp nor stricmp is standard, and Codewarrior -// on the mac has neither... -inline int strcasecmp(const char *s1, const char *s2) -{ - while (true) - { - char c1 = tolower(*s1++), - c2 = tolower(*s2++); - if (c1 < c2) return -1; - if (c1 > c2) return 1; - if (c1 == 0) return 0; - } -} -#else -#ifdef NO_STRCASECMP -ANTLR_C_USING(stricmp) -#else -ANTLR_C_USING(strcasecmp) -#endif -#endif CharScannerLiteralsLess::CharScannerLiteralsLess(const CharScanner* theScanner) : scanner(theScanner) diff --git a/poxml/antlr/src/Parser.cpp b/poxml/antlr/src/Parser.cpp index 115bf228..debe5900 100644 --- a/poxml/antlr/src/Parser.cpp +++ b/poxml/antlr/src/Parser.cpp @@ -40,7 +40,6 @@ #include <stdlib.h> ANTLR_BEGIN_NAMESPACE(antlr) -ANTLR_C_USING(exit) /**A generic ANTLR parser (LL(k) for k>=1) containing a bunch of * utility routines useful at any lookahead depth. We distinguish between diff --git a/poxml/antlr/src/String.cpp b/poxml/antlr/src/String.cpp index 79d8cd27..92a47002 100644 --- a/poxml/antlr/src/String.cpp +++ b/poxml/antlr/src/String.cpp @@ -39,7 +39,6 @@ #endif ANTLR_BEGIN_NAMESPACE(antlr) -ANTLR_C_USING(sprintf) ANTLR_USE_NAMESPACE(std)string operator+(const ANTLR_USE_NAMESPACE(std)string& lhs,int rhs) { diff --git a/poxml/antlr/src/TreeParser.cpp b/poxml/antlr/src/TreeParser.cpp index 1e83bd77..52d8c50d 100644 --- a/poxml/antlr/src/TreeParser.cpp +++ b/poxml/antlr/src/TreeParser.cpp @@ -36,7 +36,6 @@ #include <stdlib.h> ANTLR_BEGIN_NAMESPACE(antlr) -ANTLR_C_USING(exit) TreeParser::TreeParser() : inputState(new TreeParserInputState()), traceDepth(0) diff --git a/poxml/lauri.po b/poxml/lauri.po index d212f69a..9dd0d025 100644 --- a/poxml/lauri.po +++ b/poxml/lauri.po @@ -407,7 +407,7 @@ msgid "" "-> int penWidth()\n" "-> { return pen.width(); }\n" "\n" -" public Q_SLOTS:\n" +" public slots:\n" " void updateAllViews(KScribbleView *sender);\n" " \n" " protected:\n" @@ -429,7 +429,7 @@ msgstr "" " \n" "-> int penWidth()\n" "-> { return pen.width(); }\n" -" public Q_SLOTS:\n" +" public slots:\n" " void updateAllViews(KScribbleView *sender);\n" " \n" " protected:\n" diff --git a/poxml/lauri.xml b/poxml/lauri.xml index 18a1e08a..27715981 100644 --- a/poxml/lauri.xml +++ b/poxml/lauri.xml @@ -221,7 +221,7 @@ Send ppp -> int penWidth() -> { return pen.width(); } - public Q_SLOTS: + public slots: void updateAllViews(KScribbleView *sender); protected: diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp index 5c5e2579..596adc78 100644 --- a/scheck/scheck.cpp +++ b/scheck/scheck.cpp @@ -95,7 +95,7 @@ class StyleCheckStylePlugin : public TQStylePlugin } }; -KDE_Q_EXPORT_PLUGIN( StyleCheckStylePlugin ) +TDE_EXPORT_PLUGIN( StyleCheckStylePlugin ) // --------------------------------------------------- @@ -815,7 +815,7 @@ static void renderViolations(const TQValueVector<StyleGuideViolation>& violation StyleCheckTitleWatcher::StyleCheckTitleWatcher() { TQTimer* checkTimer = new TQTimer(this); - connect( checkTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCheck()) ); + connect( checkTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCheck()) ); checkTimer->start(1000); } @@ -880,7 +880,7 @@ StyleCheckStyle::StyleCheckStyle( ) { hoverWidget = 0L; topLevelAccelManageTimer = new TQTimer(this); - connect(topLevelAccelManageTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAccelManage())); + connect(topLevelAccelManageTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotAccelManage())); watcher = new StyleCheckTitleWatcher; xxMode = (TQString(getenv("KDE_LANG"))=="xx"); } @@ -909,7 +909,7 @@ void StyleCheckStyle::accelManageRecursive(TQWidget* widget) while ((walk = iter.current())) { if (walk->isWidgetType()) - accelManageRecursive(TQT_TQWIDGET(walk)); + accelManageRecursive(static_cast<TQWidget*>(walk)); ++iter; } } @@ -2637,7 +2637,7 @@ bool StyleCheckStyle::objectEventHandler( const TQStyleControlElementData &ceDat if ( event->type() == TQEvent::Paint && object->inherits("TQLabel") ) { - TQLabel* lb = static_cast<TQLabel*>(TQT_TQWIDGET(object)); + TQLabel* lb = static_cast<TQLabel*>(object); if (lb->pixmap() || lb->picture() || lb->movie() || (lb->textFormat() == TQt::RichText) || (lb->textFormat() == TQt::AutoText && TQStyleSheet::mightBeRichText(lb->text())) ) { @@ -2702,12 +2702,12 @@ bool StyleCheckStyle::objectEventHandler( const TQStyleControlElementData &ceDat if ( event->type() == TQEvent::Paint && object->inherits("TQGroupBox") ) { TQPaintEvent * pevent = static_cast<TQPaintEvent*>(event); - TQGroupBox* gb = static_cast<TQGroupBox*>(TQT_TQWIDGET(object)); + TQGroupBox* gb = static_cast<TQGroupBox*>(object); bool nestedGroupBox = false; TQString stripped_title = removedXX(stripAccelViolations(gb->title())); //Walk parent hierarchy to check whether any are groupboxes too.. - TQObject* parent = TQT_TQOBJECT(gb); + TQObject* parent = gb; // GCC suggested parentheses around assignment used as truth value // I suggested that it could eat me. GCC won. diff --git a/scripts/completions/zsh/_tdekillall b/scripts/completions/zsh/_tdekillall index bff071af..77700f31 100644 --- a/scripts/completions/zsh/_tdekillall +++ b/scripts/completions/zsh/_tdekillall @@ -4,5 +4,5 @@ local progs progs=(`ps x | grep tdeinit: | grep -v Running | grep -v grep | sed 's,.*tdeinit: ,,' | sed 's, .*,,'`) _alternative \ - 'Q_SIGNALS:: _Q_SIGNALS -p' \ + 'signals:: _signals -p' \ 'compadd $progs' diff --git a/scripts/fixheaders b/scripts/fixheaders index eb9dbeb4..94455315 100644 --- a/scripts/fixheaders +++ b/scripts/fixheaders @@ -21,7 +21,7 @@ $lastdir = '.'; 'implicit declaration of function `int i18n\(\.\.\.\)\'' => "klocale", '`i18n\' undeclared \(first use this function\)' => "klocale", 'variable `class QPixmap \S*\' has initializer but incomplete type' => "qpixmap", - '`kapp\' undeclared \(first use this function\)' => "kapplication", + '`tdeApp\' undeclared \(first use this function\)' => "kapplication", 'no matching function for call to `TDELocale::' => "klocale", '`klocale\' undeclared \(first use this function\)' => "klocale", 'no matching function for call to `QPopupMenu::' => "qpopupmenu", @@ -46,10 +46,10 @@ $lastdir = '.'; 'implicit declaration of function `int f?printf' => "stdio", 'no method `TDEGlobal::' => "kglobal", '`TDEGlobal\' undeclared \(first use this function\)' => "kglobal", - 'implicit declaration of function `int locate\(\.\.\.\)' => "kstddirs", - '`locate\' undeclared \(first use this function\)' => "kstddirs", - 'no matching function for call to `TDEStandardDirs' => "kstddirs", - 'no method `TDEStandardDirs::' => "kstddirs", + 'implicit declaration of function `int locate\(\.\.\.\)' => "tdestandarddirs", + '`locate\' undeclared \(first use this function\)' => "tdestandarddirs", + 'no matching function for call to `TDEStandardDirs' => "tdestandarddirs", + 'no method `TDEStandardDirs::' => "tdestandarddirs", 'variable `class QFile \S*\' has initializer but incomplete type' => "qfile", 'implicit declaration of function `int ICON\(\.\.\.\)' => "kiconloader", '`QMessageBox\' undeclared \(first use this function\)' => "qmessagebox", @@ -74,7 +74,7 @@ $lastdir = '.'; 'implicit declaration of function `int UserIcon\(...\)\'' => "kiconloader", '`TDEIcon\' undeclared \(first use this function\)' => "kiconloader", 'invalid use of undefined type `class TDEIconLoader' => "kiconloader", - 'invalid use of undefined type `class TDEInstance' => "kinstance", + 'invalid use of undefined type `class TDEInstance' => "tdeinstance", 'invalid use of undefined type `class DCOPClient' => "dcopclient", '`DCOPClient\' undeclared \(first use this function\)' => "dcopclient", 'invalid use of undefined type `class KStatusBar\'' => "kstatusbar", diff --git a/scripts/kde-devel-emacs.el b/scripts/kde-devel-emacs.el index ad3cebe0..ef7188f5 100644 --- a/scripts/kde-devel-emacs.el +++ b/scripts/kde-devel-emacs.el @@ -98,7 +98,7 @@ With arg, to it arg times." indent-tabs-mode nil fume-auto-rescan-buffer-p nil c-basic-offset 4 - c-access-key "\\<\\(Q_SIGNALS\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+Q_SLOTS\\)?\\)\\>:" + c-access-key "\\<\\(signals\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+slots\\)?\\)\\>:" c-hanging-comment-ender-p nil c-offsets-alist (append '((case-label . 0) (access-label . -) @@ -758,7 +758,7 @@ With arg, to it arg times." (save-excursion (c-safe (progn (c-backward-sexp 1) t)) ;; agulbrahack 2 - (and (looking-at "Q_SLOTS:") + (and (looking-at "slots:") (c-backward-sexp 1)) (looking-at c-access-key))) (c-backward-sexp 1) diff --git a/scripts/kde-devel-vim.vim b/scripts/kde-devel-vim.vim index a1832c51..af5996a4 100644 --- a/scripts/kde-devel-vim.vim +++ b/scripts/kde-devel-vim.vim @@ -240,14 +240,14 @@ function! MapIdentHeader( ident ) return '<tdelistview.h>' elseif a:ident =~ 'kd\(Debug\|Warning\|Error\|Fatal\|Backtrace\)' return '<kdebug.h>' - elseif a:ident == 'kapp' + elseif a:ident == 'tdeApp' return '<tdeapplication.h>' elseif a:ident == 'i18n' || \a:ident == 'I18N_NOOP' return '<tdelocale.h>' elseif a:ident == 'locate' || \a:ident == 'locateLocal' - return '<kstandarddirs.h>' + return '<tdestandarddirs.h>' " aRts stuff elseif a:ident =~ '\arts_\(debug\|info\|warning\|fatal\)' @@ -383,11 +383,11 @@ endfunction function! AddQtSyntax() if expand( "<amatch>" ) == "cpp" - syn keyword qtKeywords Q_SIGNALS Q_SLOTS emit foreach - syn keyword qtMacros TQ_OBJECT Q_WIDGET TQ_PROPERTY TQ_ENUMS TQ_OVERRIDE TQ_CLASSINFO TQ_SETS SIGNAL SLOT + syn keyword qtKeywords TQ_SIGNALS TQ_SLOTS emit foreach + syn keyword qtMacros TQ_OBJECT TQ_WIDGET TQ_PROPERTY TQ_ENUMS TQ_OVERRIDE TQ_CLASSINFO TQ_SETS TQ_SIGNAL TQ_SLOT syn keyword qtCast qt_cast qobject_cast qvariant_cast qstyleoption_cast syn keyword qtTypedef uchar uint ushort ulong TQ_INT8 TQ_UINT8 TQ_INT16 TQ_UINT16 TQ_INT32 TQ_UINT32 TQ_LONG TQ_ULONG TQ_INT64 TQ_UINT64 TQ_LLONG TQ_ULLONG pchar puchar pcchar qint8 quint8 qint16 quint16 qint32 quint32 qint64 quint64 qlonglong qulonglong - syn keyword kdeKeywords k_dcop k_dcop_Q_SIGNALS + syn keyword kdeKeywords k_dcop k_dcop_signals syn keyword kdeMacros K_DCOP ASYNC syn keyword cRepeat foreach syn keyword cRepeat forever diff --git a/scripts/kde-emacs/kde-emacs-core.el b/scripts/kde-emacs/kde-emacs-core.el index 030ffd39..5b09f95c 100644 --- a/scripts/kde-emacs/kde-emacs-core.el +++ b/scripts/kde-emacs/kde-emacs-core.el @@ -151,10 +151,10 @@ With arg, do it arg times." (define-key c++-mode-map "\ef" 'c-forward-into-nomenclature) (define-key c++-mode-map "\ed" 'agulbra-delete-into-nomenclature) (define-key c++-mode-map "\eb" 'c-backward-into-nomenclature) - ;; fontify "public|protected|private Q_SLOTS" with one and the same face :) + ;; fontify "public|protected|private slots" with one and the same face :) ;; NOTE: write face-at-point function to fontify those just like other ;; access specifiers - (font-lock-add-keywords nil '(("\\<\\(\\(public\\|protected\\|private\\) Q_SLOTS\\)\\>" + (font-lock-add-keywords nil '(("\\<\\(\\(public\\|protected\\|private\\) slots\\)\\>" . font-lock-reference-face))) ;; Add (set magic-keys-mode nil) to your .emacs (before loading this file) ;; to disable the magic keys in C++ mode. @@ -866,7 +866,7 @@ This function does not do any hidden buffer changes." (not (bobp)) (save-excursion (c-safe (progn (c-backward-sexp 1) t)) - (and (looking-at "Q_SLOTS:") + (and (looking-at "slots:") (c-backward-sexp 1)) (looking-at c-opt-access-key))) (c-backward-sexp 1) @@ -2116,7 +2116,7 @@ This function does not do any hidden buffer changes." (not (bobp)) (save-excursion (c-safe (progn (c-backward-sexp 1) t)) - (and (looking-at "Q_SLOTS:") + (and (looking-at "slots:") (c-backward-sexp 1)) (looking-at c-opt-access-key))) (c-backward-sexp 1) @@ -3172,7 +3172,7 @@ This function does not do any hidden buffer changes." (save-excursion (c-safe (progn (c-backward-sexp 1) t)) ;; agulbrahack 2 - (and (looking-at "Q_SLOTS:") + (and (looking-at "slots:") (c-backward-sexp 1)) (looking-at c-access-key))) (c-backward-sexp 1) diff --git a/scripts/kde-emacs/kde-emacs-semantic.el b/scripts/kde-emacs/kde-emacs-semantic.el index 5e5c156b..57db7f75 100644 --- a/scripts/kde-emacs/kde-emacs-semantic.el +++ b/scripts/kde-emacs/kde-emacs-semantic.el @@ -148,12 +148,12 @@ token and TOKENS have to be a list of functions from buffer." ret )) -(defmacro kde-label-Q_SIGNALS (pt) - "Returns none-nil if the current access label == \"Q_SIGNALS\"" +(defmacro kde-label-signals (pt) + "Returns none-nil if the current access label == \"signals\"" `(save-excursion (goto-char ,pt) (if (looking-at ":") - (re-search-backward "Q_SIGNALS" (point-at-bol) t) + (re-search-backward "signals" (point-at-bol) t) ) )) @@ -171,13 +171,13 @@ token and TOKENS have to be a list of functions from buffer." ) )) -(defmacro kde-label-Q_SLOTS (pt) - "Return none-nil if at PT there's Q_SLOTS access specifier." +(defmacro kde-label-slots (pt) + "Return none-nil if at PT there's slots access specifier." `(save-excursion (goto-char ,pt) (if (looking-at ":") ;; export this regex to a kde-emacs-vars defvar - (re-search-backward "\\(public\\|protected\\|private\\)[ \t]+Q_SLOTS" (point-at-bol) t)) + (re-search-backward "\\(public\\|protected\\|private\\)[ \t]+slots" (point-at-bol) t)) )) (defmacro kde-is-constructor (function) @@ -304,7 +304,7 @@ class-token has to be a token representing either a class or a struct." (stringp cur-token-name)) (set aslot nil asignal nil) - ;;LABEL - unsets both Q_SIGNALS and Q_SLOTS + ;;LABEL - unsets both signals and slots ) ((and (eq cur-token 'variable) @@ -313,8 +313,8 @@ class-token has to be a token representing either a class or a struct." ) ((not (stringp cur-token-name)) (cond - ((kde-label-Q_SIGNALS (car (semantic-token-extent elt))) - ;;SIGNALS - next prototypes belong to Q_SIGNALS and we don't want to + ((kde-label-signals (car (semantic-token-extent elt))) + ;;SIGNALS - next prototypes belong to signals and we don't want to ;; expand those (set asignal t aslot nil) @@ -324,8 +324,8 @@ class-token has to be a token representing either a class or a struct." ;; so we do ;) (set namespace (kde-label-namespace (car (semantic-token-extent elt)))) ) - ((kde-label-Q_SLOTS (car (semantic-token-extent elt))) - ;;SLOTS - for now just unset Q_SIGNALS + ((kde-label-slots (car (semantic-token-extent elt))) + ;;SLOTS - for now just unset signals (set aslot t asignal nil) ) diff --git a/scripts/kde-emacs/kde-emacs-vars.el b/scripts/kde-emacs/kde-emacs-vars.el index b2333b30..216e64f5 100644 --- a/scripts/kde-emacs/kde-emacs-vars.el +++ b/scripts/kde-emacs/kde-emacs-vars.el @@ -39,7 +39,7 @@ ;*---------------------------------------------------------------------*/ (defconst kde-access-labels - "\\<\\(Q_SIGNALS\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+Q_SLOTS\\)?\\)\\>:" + "\\<\\(signals\\|k_dcop\\|\\(public\\|protected\\|private\\)\\([ ]+slots\\)?\\)\\>:" "KDE specific access labels regexp.") (defconst kde-source-files '("cpp" "cc" "cxx" "CC" "C" "c") diff --git a/scripts/kde-emacs/klaralv.el b/scripts/kde-emacs/klaralv.el index d93fa0ff..629a5980 100644 --- a/scripts/kde-emacs/klaralv.el +++ b/scripts/kde-emacs/klaralv.el @@ -173,9 +173,9 @@ ; Useful fake entries (qapplication.h tqApp) - (tdeapplication.h kapp) + (tdeapplication.h tdeApp) (tdelocale.h i18n I18N_NOOP) - (kstandarddirs.h locate locateLocal) + (tdestandarddirs.h locate locateLocal) (stdlib.h getenv) (unistd.h unlink sleep usleep) (iostream cout cerr) diff --git a/tdecachegrind/CMakeLists.txt b/tdecachegrind/CMakeLists.txt index afa2d31f..5a011aee 100644 --- a/tdecachegrind/CMakeLists.txt +++ b/tdecachegrind/CMakeLists.txt @@ -13,7 +13,6 @@ include( ConfigureChecks.cmake ) set( TDECACHEGRIND_VERSION "0.4.6kde" ) configure_file( version.h.in version.h @ONLY ) -configure_file( tdecachegrind.spec.in tdecachegrind.spec @ONLY ) add_subdirectory( tdecachegrind ) add_subdirectory( pics ) diff --git a/tdecachegrind/Makefile.am b/tdecachegrind/Makefile.am index c2ed2d26..214a8d92 100644 --- a/tdecachegrind/Makefile.am +++ b/tdecachegrind/Makefile.am @@ -1,6 +1,5 @@ SUBDIRS = tdecachegrind pics converters EXTRA_DIST = \ - AUTHORS COPYING NEWS ChangeLog INSTALL README TODO \ - tdecachegrind.spec version.h + AUTHORS COPYING NEWS ChangeLog INSTALL README TODO version.h diff --git a/tdecachegrind/configure.in.in b/tdecachegrind/configure.in.in index 8cda89d2..67a9840e 100644 --- a/tdecachegrind/configure.in.in +++ b/tdecachegrind/configure.in.in @@ -4,4 +4,3 @@ AC_SUBST(TDECACHEGRIND_VERSION) AC_FUNC_MMAP dnl AC_OUTPUT( tdecachegrind/version.h ) -dnl AC_OUTPUT( tdecachegrind/tdecachegrind.spec ) diff --git a/tdecachegrind/tdecachegrind.spec.in b/tdecachegrind/tdecachegrind.spec.in deleted file mode 100644 index 42b3e24e..00000000 --- a/tdecachegrind/tdecachegrind.spec.in +++ /dev/null @@ -1,55 +0,0 @@ -Summary: KDE Profiling Visualisation Tool -Name: tdecachegrind -Version: @TDECACHEGRIND_VERSION@ -Release: 1 -Copyright: GPL -Group: Development/Tools -Vendor: (none) -URL: http://tdecachegrind.sourceforge.net -Packager: Josef Weidendorfer <Josef.Weidendorfer@gmx.de> -Source: tdecachegrind-@TDECACHEGRIND_VERSION@.tar.gz -BuildRoot: /var/tmp/build - -%description -KCachegrind is a GPL'd tool for quick browsing in and visualisation -of performance data of an application run. This data is produced by -profiling tools and typically includes distribution of cost events -to source code ranges (instructions, source lines, functions, C++ classes) -and call relationship of functions. -KCachegrind has a list of functions sorted according to different cost -types, and can provide various performance views for a function like -direct/indirect callers/callees, TreeMap visualisation of cost distribution -among callees, call graph sectors centered around the function and -annotated source/assembler. -Currently, KCachegrind depends on data delivered by the profiling tool -calltree, powered by the Valgrind runtime instrumentation framework. - -%prep -%setup -CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure \ - \ - $LOCALFLAGS -%build -# Setup for parallel builds -numprocs=`egrep -c ^cpu[0-9]+ /proc/stat || :` -if [ "$numprocs" = "0" ]; then - numprocs=1 -fi - -make -j$numprocs - -%install -make install-strip DESTDIR=$RPM_BUILD_ROOT - -cd $RPM_BUILD_ROOT -find . -type d | sed '1,2d;s,^\.,\%attr(-\,root\,root) \%dir ,' > $RPM_BUILD_DIR/file.list.tdecachegrind -find . -type f | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.tdecachegrind -find . -type l | sed 's,^\.,\%attr(-\,root\,root) ,' >> $RPM_BUILD_DIR/file.list.tdecachegrind - -%clean -rm -rf $RPM_BUILD_ROOT/* -rm -rf $RPM_BUILD_DIR/tdecachegrind -rm -rf ../file.list.tdecachegrind - - -%files -f ../file.list.tdecachegrind diff --git a/tdecachegrind/tdecachegrind/cachegrindloader.cpp b/tdecachegrind/tdecachegrind/cachegrindloader.cpp index 9434ee36..ea688e74 100644 --- a/tdecachegrind/tdecachegrind/cachegrindloader.cpp +++ b/tdecachegrind/tdecachegrind/cachegrindloader.cpp @@ -181,8 +181,8 @@ bool CachegrindLoader::loadTrace(TracePart* p) CachegrindLoader l; /* emit progress signals via the singleton loader */ - connect(&l, TQT_SIGNAL(updateStatus(TQString, int)), - this, TQT_SIGNAL(updateStatus(TQString, int))); + connect(&l, TQ_SIGNAL(updateStatus(TQString, int)), + this, TQ_SIGNAL(updateStatus(TQString, int))); return l.loadTraceInternal(p); } diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp index bf87b28a..2b785c9a 100644 --- a/tdecachegrind/tdecachegrind/callgraphview.cpp +++ b/tdecachegrind/tdecachegrind/callgraphview.cpp @@ -1149,7 +1149,7 @@ CanvasEdgeLabel::CanvasEdgeLabel(CallGraphView* v, CanvasEdge* ce, if (e->call() && (e->call()->isRecursion() || e->call()->inCycle())) { TQString icon = "edit-undo"; - TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); TQPixmap p= loader->loadIcon(icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true); setPixmap(0, p); @@ -1391,12 +1391,12 @@ CallGraphView::CallGraphView(TraceItemView* parentView, setFocusPolicy(TQWidget::StrongFocus); setBackgroundMode(TQt::NoBackground); - connect(this, TQT_SIGNAL(contentsMoving(int,int)), - this, TQT_SLOT(contentsMovingSlot(int,int))); - connect(_completeView, TQT_SIGNAL(zoomRectMoved(int,int)), - this, TQT_SLOT(zoomRectMoved(int,int))); - connect(_completeView, TQT_SIGNAL(zoomRectMoveFinished()), - this, TQT_SLOT(zoomRectMoveFinished())); + connect(this, TQ_SIGNAL(contentsMoving(int,int)), + this, TQ_SLOT(contentsMovingSlot(int,int))); + connect(_completeView, TQ_SIGNAL(zoomRectMoved(int,int)), + this, TQ_SLOT(zoomRectMoved(int,int))); + connect(_completeView, TQ_SIGNAL(zoomRectMoveFinished()), + this, TQ_SLOT(zoomRectMoveFinished())); TQWhatsThis::add( this, whatsThis() ); @@ -1405,8 +1405,8 @@ CallGraphView::CallGraphView(TraceItemView* parentView, _renderProcess = 0; _prevSelectedNode = 0; - connect(&_renderTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(showRenderWarning())); + connect(&_renderTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(showRenderWarning())); } CallGraphView::~CallGraphView() @@ -1846,7 +1846,7 @@ void CallGraphView::refresh() _exporter.reset(_data, _activeItem, _costType, _groupType); _exporter.writeDot(); - _renderProcess = new TQProcess(TQT_TQOBJECT(this)); + _renderProcess = new TQProcess(this); if (_layout == GraphOptions::Circular) _renderProcess->addArgument( "twopi" ); else @@ -1854,10 +1854,10 @@ void CallGraphView::refresh() _renderProcess->addArgument(_exporter.filename()); _renderProcess->addArgument( "-Tplain" ); - connect( _renderProcess, TQT_SIGNAL(readyReadStdout()), - this, TQT_SLOT(readDotOutput()) ); - connect( _renderProcess, TQT_SIGNAL(processExited()), - this, TQT_SLOT(dotExited()) ); + connect( _renderProcess, TQ_SIGNAL(readyReadStdout()), + this, TQ_SLOT(readDotOutput()) ); + connect( _renderProcess, TQ_SIGNAL(processExited()), + this, TQ_SLOT(dotExited()) ); if (1) kdDebug() << "Running '" << _renderProcess->arguments().join(" ") diff --git a/tdecachegrind/tdecachegrind/callitem.cpp b/tdecachegrind/tdecachegrind/callitem.cpp index d40f1feb..737eb39d 100644 --- a/tdecachegrind/tdecachegrind/callitem.cpp +++ b/tdecachegrind/tdecachegrind/callitem.cpp @@ -146,7 +146,7 @@ void CallItem::updateCost() if (sameCycle && !selectedIsCycle && !shownIsCycle) { TQString icon = "edit-undo"; - TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); p= loader->loadIcon(icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true); } diff --git a/tdecachegrind/tdecachegrind/callmapview.cpp b/tdecachegrind/tdecachegrind/callmapview.cpp index 550eb8a4..4a0a87d5 100644 --- a/tdecachegrind/tdecachegrind/callmapview.cpp +++ b/tdecachegrind/tdecachegrind/callmapview.cpp @@ -77,17 +77,17 @@ CallMapView::CallMapView(bool showCallers, TraceItemView* parentView, setMinimalArea(DEFAULT_MAXAREA); connect(this, - TQT_SIGNAL(doubleClicked(TreeMapItem*)), - TQT_SLOT(activatedSlot(TreeMapItem*))); + TQ_SIGNAL(doubleClicked(TreeMapItem*)), + TQ_SLOT(activatedSlot(TreeMapItem*))); connect(this, - TQT_SIGNAL(returnPressed(TreeMapItem*)), - TQT_SLOT(activatedSlot(TreeMapItem*))); + TQ_SIGNAL(returnPressed(TreeMapItem*)), + TQ_SLOT(activatedSlot(TreeMapItem*))); connect(this, - TQT_SIGNAL(currentChanged(TreeMapItem*, bool)), - TQT_SLOT(selectedSlot(TreeMapItem*, bool))); + TQ_SIGNAL(currentChanged(TreeMapItem*, bool)), + TQ_SLOT(selectedSlot(TreeMapItem*, bool))); connect(this, - TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint &)), - TQT_SLOT(context(TreeMapItem*,const TQPoint &))); + TQ_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint &)), + TQ_SLOT(context(TreeMapItem*,const TQPoint &))); TQWhatsThis::add( this, whatsThis()); } diff --git a/tdecachegrind/tdecachegrind/callview.cpp b/tdecachegrind/tdecachegrind/callview.cpp index f4be7ae7..edf82bf1 100644 --- a/tdecachegrind/tdecachegrind/callview.cpp +++ b/tdecachegrind/tdecachegrind/callview.cpp @@ -61,20 +61,20 @@ CallView::CallView(bool showCallers, TraceItemView* parentView, setMinimumHeight(50); connect( this, - TQT_SIGNAL( selectionChanged(TQListViewItem*) ), - TQT_SLOT( selectedSlot(TQListViewItem*) ) ); + TQ_SIGNAL( selectionChanged(TQListViewItem*) ), + TQ_SLOT( selectedSlot(TQListViewItem*) ) ); connect( this, - TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - TQT_SLOT(context(TQListViewItem*, const TQPoint &, int))); + TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + TQ_SLOT(context(TQListViewItem*, const TQPoint &, int))); connect(this, - TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(activatedSlot(TQListViewItem*))); + TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(activatedSlot(TQListViewItem*))); connect(this, - TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(activatedSlot(TQListViewItem*))); + TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(activatedSlot(TQListViewItem*))); TQWhatsThis::add( this, whatsThis() ); } diff --git a/tdecachegrind/tdecachegrind/configdlg.cpp b/tdecachegrind/tdecachegrind/configdlg.cpp index 47a3c782..3cb2a988 100644 --- a/tdecachegrind/tdecachegrind/configdlg.cpp +++ b/tdecachegrind/tdecachegrind/configdlg.cpp @@ -62,32 +62,32 @@ ConfigDlg::ConfigDlg(Configuration* c, TraceData* data, fnItem = new(colorList, i18n("Function (no Grouping)")); #endif - connect(objectCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(objectActivated(const TQString &))); - connect(objectCombo, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(objectActivated(const TQString &))); - connect(objectCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(objectCheckChanged(bool))); - connect(objectColor, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(objectColorChanged(const TQColor &))); - - connect(classCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(classActivated(const TQString &))); - connect(classCombo, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(classActivated(const TQString &))); - connect(classCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(classCheckChanged(bool))); - connect(classColor, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(classColorChanged(const TQColor &))); - - connect(fileCombo, TQT_SIGNAL(activated(const TQString &)), - this, TQT_SLOT(fileActivated(const TQString &))); - connect(fileCombo, TQT_SIGNAL(textChanged(const TQString &)), - this, TQT_SLOT(fileActivated(const TQString &))); - connect(fileCheck, TQT_SIGNAL(toggled(bool)), - this, TQT_SLOT(fileCheckChanged(bool))); - connect(fileColor, TQT_SIGNAL(changed(const TQColor &)), - this, TQT_SLOT(fileColorChanged(const TQColor &))); + connect(objectCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(objectActivated(const TQString &))); + connect(objectCombo, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(objectActivated(const TQString &))); + connect(objectCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(objectCheckChanged(bool))); + connect(objectColor, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(objectColorChanged(const TQColor &))); + + connect(classCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(classActivated(const TQString &))); + connect(classCombo, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(classActivated(const TQString &))); + connect(classCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(classCheckChanged(bool))); + connect(classColor, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(classColorChanged(const TQColor &))); + + connect(fileCombo, TQ_SIGNAL(activated(const TQString &)), + this, TQ_SLOT(fileActivated(const TQString &))); + connect(fileCombo, TQ_SIGNAL(textChanged(const TQString &)), + this, TQ_SLOT(fileActivated(const TQString &))); + connect(fileCheck, TQ_SIGNAL(toggled(bool)), + this, TQ_SLOT(fileCheckChanged(bool))); + connect(fileColor, TQ_SIGNAL(changed(const TQColor &)), + this, TQ_SLOT(fileColorChanged(const TQColor &))); TQString objectPrefix = TraceCost::typeName(TraceCost::Object); TQString classPrefix = TraceCost::typeName(TraceCost::Class); @@ -178,12 +178,12 @@ ConfigDlg::ConfigDlg(Configuration* c, TraceData* data, } } - connect(dirList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(dirsItemChanged(TQListViewItem*))); - connect(addDirButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(dirsAddPressed())); - connect(deleteDirButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(dirsDeletePressed())); + connect(dirList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(dirsItemChanged(TQListViewItem*))); + connect(addDirButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(dirsAddPressed())); + connect(deleteDirButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(dirsDeletePressed())); dirList->setSelected(dirList->firstChild(), true); symbolCount->setText(TQString::number(c->_maxSymbolCount)); diff --git a/tdecachegrind/tdecachegrind/costtypeview.cpp b/tdecachegrind/tdecachegrind/costtypeview.cpp index 3f8780ac..18bef5cd 100644 --- a/tdecachegrind/tdecachegrind/costtypeview.cpp +++ b/tdecachegrind/tdecachegrind/costtypeview.cpp @@ -54,24 +54,24 @@ CostTypeView::CostTypeView(TraceItemView* parentView, setMinimumHeight(50); connect( this, - TQT_SIGNAL( selectionChanged(TQListViewItem*) ), - TQT_SLOT( selectedSlot(TQListViewItem*) ) ); + TQ_SIGNAL( selectionChanged(TQListViewItem*) ), + TQ_SLOT( selectedSlot(TQListViewItem*) ) ); connect( this, - TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - TQT_SLOT(context(TQListViewItem*, const TQPoint &, int))); + TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + TQ_SLOT(context(TQListViewItem*, const TQPoint &, int))); connect(this, - TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(activatedSlot(TQListViewItem*))); + TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(activatedSlot(TQListViewItem*))); connect(this, - TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(activatedSlot(TQListViewItem*))); + TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(activatedSlot(TQListViewItem*))); connect(this, - TQT_SIGNAL(itemRenamed(TQListViewItem*,int,const TQString&)), - TQT_SLOT(renamedSlot(TQListViewItem*,int,const TQString&))); + TQ_SIGNAL(itemRenamed(TQListViewItem*,int,const TQString&)), + TQ_SLOT(renamedSlot(TQListViewItem*,int,const TQString&))); TQWhatsThis::add( this, whatsThis() ); } diff --git a/tdecachegrind/tdecachegrind/coverageview.cpp b/tdecachegrind/tdecachegrind/coverageview.cpp index b1ead5eb..3f361f2c 100644 --- a/tdecachegrind/tdecachegrind/coverageview.cpp +++ b/tdecachegrind/tdecachegrind/coverageview.cpp @@ -66,20 +66,20 @@ CoverageView::CoverageView(bool showCallers, TraceItemView* parentView, setMinimumHeight(50); connect( this, - TQT_SIGNAL( selectionChanged(TQListViewItem*) ), - TQT_SLOT( selectedSlot(TQListViewItem*) ) ); + TQ_SIGNAL( selectionChanged(TQListViewItem*) ), + TQ_SLOT( selectedSlot(TQListViewItem*) ) ); connect( this, - TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - TQT_SLOT(context(TQListViewItem*, const TQPoint &, int))); + TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + TQ_SLOT(context(TQListViewItem*, const TQPoint &, int))); connect(this, - TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(activatedSlot(TQListViewItem*))); + TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(activatedSlot(TQListViewItem*))); connect(this, - TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(activatedSlot(TQListViewItem*))); + TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(activatedSlot(TQListViewItem*))); TQWhatsThis::add( this, whatsThis() ); } diff --git a/tdecachegrind/tdecachegrind/functionselection.cpp b/tdecachegrind/tdecachegrind/functionselection.cpp index 84bdeabd..7a866ea7 100644 --- a/tdecachegrind/tdecachegrind/functionselection.cpp +++ b/tdecachegrind/tdecachegrind/functionselection.cpp @@ -57,17 +57,17 @@ FunctionSelection::FunctionSelection( TopLevel* top, groupBox->insertStringList(args); // this needs same order of grouptype actionlist! - connect(groupBox, TQT_SIGNAL(activated(int)), - top, TQT_SLOT(groupTypeSelected(int))); + connect(groupBox, TQ_SIGNAL(activated(int)), + top, TQ_SLOT(groupTypeSelected(int))); // search while typing... - connect(searchEdit, TQT_SIGNAL(textChanged(const TQString&)), - this, TQT_SLOT(searchChanged(const TQString&))); - connect(&_searchTimer, TQT_SIGNAL(timeout()), - this, TQT_SLOT(queryDelayed())); + connect(searchEdit, TQ_SIGNAL(textChanged(const TQString&)), + this, TQ_SLOT(searchChanged(const TQString&))); + connect(&_searchTimer, TQ_SIGNAL(timeout()), + this, TQ_SLOT(queryDelayed())); // select first matching group/function on return - connect(searchEdit, TQT_SIGNAL(returnPressed()), - this, TQT_SLOT(searchReturnPressed())); + connect(searchEdit, TQ_SIGNAL(returnPressed()), + this, TQ_SLOT(searchReturnPressed())); searchEdit->setMinimumWidth(50); // we start with desending cost sorting @@ -91,33 +91,33 @@ FunctionSelection::FunctionSelection( TopLevel* top, #if 0 // single click press activation - connect(functionList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(functionActivated(TQListViewItem*))); + connect(functionList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(functionActivated(TQListViewItem*))); connect(functionList, - TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT(functionContext(TQListViewItem*, const TQPoint &, int))); + TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT(functionContext(TQListViewItem*, const TQPoint &, int))); #else // single click release activation - connect(functionList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(functionSelected(TQListViewItem*))); - connect(functionList, TQT_SIGNAL(clicked(TQListViewItem*)), - this, TQT_SLOT(functionActivated(TQListViewItem*))); - connect(functionList, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(functionActivated(TQListViewItem*))); + connect(functionList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(functionSelected(TQListViewItem*))); + connect(functionList, TQ_SIGNAL(clicked(TQListViewItem*)), + this, TQ_SLOT(functionActivated(TQListViewItem*))); + connect(functionList, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(functionActivated(TQListViewItem*))); connect(functionList, - TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT(functionContext(TQListViewItem*, const TQPoint &, int))); + TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT(functionContext(TQListViewItem*, const TQPoint &, int))); #endif - connect(groupList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(groupSelected(TQListViewItem*))); - connect(groupList, TQT_SIGNAL(doubleClicked(TQListViewItem*)), - this, TQT_SLOT(groupDoubleClicked(TQListViewItem*))); - connect(groupList, TQT_SIGNAL(returnPressed(TQListViewItem*)), - this, TQT_SLOT(groupDoubleClicked(TQListViewItem*))); + connect(groupList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(groupSelected(TQListViewItem*))); + connect(groupList, TQ_SIGNAL(doubleClicked(TQListViewItem*)), + this, TQ_SLOT(groupDoubleClicked(TQListViewItem*))); + connect(groupList, TQ_SIGNAL(returnPressed(TQListViewItem*)), + this, TQ_SLOT(groupDoubleClicked(TQListViewItem*))); connect(groupList, - TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - this, TQT_SLOT(groupContext(TQListViewItem*, const TQPoint &, int))); + TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + this, TQ_SLOT(groupContext(TQListViewItem*, const TQPoint &, int))); // start hidden groupList->hide(); @@ -237,8 +237,8 @@ void FunctionSelection::addGroupMenu(TQPopupMenu* popup) case TraceItem::FunctionCycle: popup1->setItemChecked(4, true); break; default: break; } - connect(popup1,TQT_SIGNAL(activated(int)), - _topLevel,TQT_SLOT(groupTypeSelected(int))); + connect(popup1,TQ_SIGNAL(activated(int)), + _topLevel,TQ_SLOT(groupTypeSelected(int))); popup->insertItem(i18n("Grouping"), popup1); } diff --git a/tdecachegrind/tdecachegrind/instritem.cpp b/tdecachegrind/tdecachegrind/instritem.cpp index b07c6655..36a07261 100644 --- a/tdecachegrind/tdecachegrind/instritem.cpp +++ b/tdecachegrind/tdecachegrind/instritem.cpp @@ -178,7 +178,7 @@ void InstrItem::updateCost() TQPixmap p; TQString icon = "edit-undo"; - TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); p= loader->loadIcon(icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true); if (p.isNull()) diff --git a/tdecachegrind/tdecachegrind/instrview.cpp b/tdecachegrind/tdecachegrind/instrview.cpp index bfeaccd0..5428fd6d 100644 --- a/tdecachegrind/tdecachegrind/instrview.cpp +++ b/tdecachegrind/tdecachegrind/instrview.cpp @@ -136,19 +136,19 @@ InstrView::InstrView(TraceItemView* parentView, setColumnAlignment(2, TQt::AlignRight); connect(this, - TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - TQT_SLOT(context(TQListViewItem*, const TQPoint &, int))); + TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + TQ_SLOT(context(TQListViewItem*, const TQPoint &, int))); - connect(this, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(selectedSlot(TQListViewItem*))); + connect(this, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(selectedSlot(TQListViewItem*))); connect(this, - TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(activatedSlot(TQListViewItem*))); + TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(activatedSlot(TQListViewItem*))); connect(this, - TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(activatedSlot(TQListViewItem*))); + TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(activatedSlot(TQListViewItem*))); TQWhatsThis::add( this, whatsThis()); } diff --git a/tdecachegrind/tdecachegrind/main.cpp b/tdecachegrind/tdecachegrind/main.cpp index 95b02ea4..8b9368aa 100644 --- a/tdecachegrind/tdecachegrind/main.cpp +++ b/tdecachegrind/tdecachegrind/main.cpp @@ -84,7 +84,7 @@ int main( int argc, char ** argv ) } } - a.connect( &a, TQT_SIGNAL( lastWindowClosed() ), &a, TQT_SLOT( quit() ) ); + a.connect( &a, TQ_SIGNAL( lastWindowClosed() ), &a, TQ_SLOT( quit() ) ); int res = a.exec(); // to make leak checking in valgrind happy... diff --git a/tdecachegrind/tdecachegrind/multiview.cpp b/tdecachegrind/tdecachegrind/multiview.cpp index 349db8d6..3ed96fe2 100644 --- a/tdecachegrind/tdecachegrind/multiview.cpp +++ b/tdecachegrind/tdecachegrind/multiview.cpp @@ -66,8 +66,8 @@ void MultiView::appendView() TabView* tv = new TabView(this, this, TQString("TabView-%1").arg(n).ascii()); - connect(tv, TQT_SIGNAL(activated(TabView*)), - this, TQT_SLOT(tabActivated(TabView*)) ); + connect(tv, TQ_SIGNAL(activated(TabView*)), + this, TQ_SLOT(tabActivated(TabView*)) ); _views.append(tv); tv->show(); diff --git a/tdecachegrind/tdecachegrind/partselection.cpp b/tdecachegrind/tdecachegrind/partselection.cpp index 9c8140f3..f89d356d 100644 --- a/tdecachegrind/tdecachegrind/partselection.cpp +++ b/tdecachegrind/tdecachegrind/partselection.cpp @@ -58,16 +58,16 @@ PartSelection::PartSelection( TQWidget* parent, const char* name) partAreaWidget->setFieldType(0, i18n( "Name" )); partAreaWidget->setFieldType(1, i18n( "Cost" )); - connect(partAreaWidget, TQT_SIGNAL(selectionChanged()), - this, TQT_SLOT(selectionChanged())); - connect(partAreaWidget, TQT_SIGNAL(currentChanged(TreeMapItem*, bool)), - this, TQT_SLOT(currentChangedSlot(TreeMapItem*, bool))); - connect(partAreaWidget, TQT_SIGNAL(doubleClicked(TreeMapItem*)), - this, TQT_SLOT(doubleClicked(TreeMapItem*))); + connect(partAreaWidget, TQ_SIGNAL(selectionChanged()), + this, TQ_SLOT(selectionChanged())); + connect(partAreaWidget, TQ_SIGNAL(currentChanged(TreeMapItem*, bool)), + this, TQ_SLOT(currentChangedSlot(TreeMapItem*, bool))); + connect(partAreaWidget, TQ_SIGNAL(doubleClicked(TreeMapItem*)), + this, TQ_SLOT(doubleClicked(TreeMapItem*))); connect(partAreaWidget, - TQT_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint &)), + TQ_SIGNAL(contextMenuRequested(TreeMapItem*,const TQPoint &)), this, - TQT_SLOT(contextMenuRequested(TreeMapItem*,const TQPoint &))); + TQ_SLOT(contextMenuRequested(TreeMapItem*,const TQPoint &))); _showInfo = true; showInfo(false); diff --git a/tdecachegrind/tdecachegrind/partview.cpp b/tdecachegrind/tdecachegrind/partview.cpp index e2dc707e..fe13d806 100644 --- a/tdecachegrind/tdecachegrind/partview.cpp +++ b/tdecachegrind/tdecachegrind/partview.cpp @@ -58,12 +58,12 @@ PartView::PartView(TraceItemView* parentView, setSelectionMode(Extended); connect( this, - TQT_SIGNAL( selectionChanged() ), - TQT_SLOT( selectionChangedSlot() ) ); + TQ_SIGNAL( selectionChanged() ), + TQ_SLOT( selectionChangedSlot() ) ); connect( this, - TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - TQT_SLOT(context(TQListViewItem*, const TQPoint &, int))); + TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + TQ_SLOT(context(TQListViewItem*, const TQPoint &, int))); TQWhatsThis::add( this, whatsThis() ); } diff --git a/tdecachegrind/tdecachegrind/sourceitem.cpp b/tdecachegrind/tdecachegrind/sourceitem.cpp index 85713c14..ab7ef5e9 100644 --- a/tdecachegrind/tdecachegrind/sourceitem.cpp +++ b/tdecachegrind/tdecachegrind/sourceitem.cpp @@ -162,7 +162,7 @@ void SourceItem::updateCost() TQPixmap p; TQString icon = "edit-undo"; - TDEIconLoader* loader = TDEApplication::kApplication()->iconLoader(); + TDEIconLoader* loader = tdeApp->iconLoader(); p= loader->loadIcon(icon, TDEIcon::Small, 0, TDEIcon::DefaultState, 0, true); if (p.isNull()) diff --git a/tdecachegrind/tdecachegrind/sourceview.cpp b/tdecachegrind/tdecachegrind/sourceview.cpp index 22e83453..222c4b43 100644 --- a/tdecachegrind/tdecachegrind/sourceview.cpp +++ b/tdecachegrind/tdecachegrind/sourceview.cpp @@ -60,20 +60,20 @@ SourceView::SourceView(TraceItemView* parentView, setResizeMode(TQListView::LastColumn); connect(this, - TQT_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), - TQT_SLOT(context(TQListViewItem*, const TQPoint &, int))); + TQ_SIGNAL(contextMenuRequested(TQListViewItem*, const TQPoint &, int)), + TQ_SLOT(context(TQListViewItem*, const TQPoint &, int))); connect(this, - TQT_SIGNAL(selectionChanged(TQListViewItem*)), - TQT_SLOT(selectedSlot(TQListViewItem*))); + TQ_SIGNAL(selectionChanged(TQListViewItem*)), + TQ_SLOT(selectedSlot(TQListViewItem*))); connect(this, - TQT_SIGNAL(doubleClicked(TQListViewItem*)), - TQT_SLOT(activatedSlot(TQListViewItem*))); + TQ_SIGNAL(doubleClicked(TQListViewItem*)), + TQ_SLOT(activatedSlot(TQListViewItem*))); connect(this, - TQT_SIGNAL(returnPressed(TQListViewItem*)), - TQT_SLOT(activatedSlot(TQListViewItem*))); + TQ_SIGNAL(returnPressed(TQListViewItem*)), + TQ_SLOT(activatedSlot(TQListViewItem*))); TQWhatsThis::add( this, whatsThis()); } diff --git a/tdecachegrind/tdecachegrind/stackselection.cpp b/tdecachegrind/tdecachegrind/stackselection.cpp index 59094754..e7e595ce 100644 --- a/tdecachegrind/tdecachegrind/stackselection.cpp +++ b/tdecachegrind/tdecachegrind/stackselection.cpp @@ -57,8 +57,8 @@ StackSelection::StackSelection( TQWidget* parent, const char* name) stackList->setColumnWidth(1, 0); stackList->setColumnWidth(2, 50); - connect(stackList, TQT_SIGNAL(selectionChanged(TQListViewItem*)), - this, TQT_SLOT(stackSelected(TQListViewItem*))); + connect(stackList, TQ_SIGNAL(selectionChanged(TQListViewItem*)), + this, TQ_SLOT(stackSelected(TQListViewItem*))); } StackSelection::~StackSelection() diff --git a/tdecachegrind/tdecachegrind/tabview.cpp b/tdecachegrind/tdecachegrind/tabview.cpp index b8cd09f5..d31f9517 100644 --- a/tdecachegrind/tdecachegrind/tabview.cpp +++ b/tdecachegrind/tdecachegrind/tabview.cpp @@ -247,33 +247,33 @@ TabView::TabView(TraceItemView* parentView, vbox->addWidget( _mainSplitter ); _rightTW = new TabWidget(this, _mainSplitter, "Right"); - connect(_rightTW, TQT_SIGNAL(currentChanged(TQWidget*)), - this, TQT_SLOT(tabChanged(TQWidget*))); - connect(_rightTW, TQT_SIGNAL(visibleRectChanged(TabWidget*)), - this, TQT_SLOT(visibleRectChangedSlot(TabWidget*))); + connect(_rightTW, TQ_SIGNAL(currentChanged(TQWidget*)), + this, TQ_SLOT(tabChanged(TQWidget*))); + connect(_rightTW, TQ_SIGNAL(visibleRectChanged(TabWidget*)), + this, TQ_SLOT(visibleRectChangedSlot(TabWidget*))); _topTW = new TabWidget(this, _leftSplitter, "Top"); - connect(_topTW, TQT_SIGNAL(currentChanged(TQWidget*)), - this, TQT_SLOT(tabChanged(TQWidget*))); - connect(_topTW, TQT_SIGNAL(visibleRectChanged(TabWidget*)), - this, TQT_SLOT(visibleRectChangedSlot(TabWidget*))); + connect(_topTW, TQ_SIGNAL(currentChanged(TQWidget*)), + this, TQ_SLOT(tabChanged(TQWidget*))); + connect(_topTW, TQ_SIGNAL(visibleRectChanged(TabWidget*)), + this, TQ_SLOT(visibleRectChangedSlot(TabWidget*))); _bottomSplitter = new Splitter(TQt::Horizontal, _leftSplitter, "Bottom"); _leftTW = new TabWidget(this, _bottomSplitter, "Left"); _leftTW->setTabPosition(TQTabWidget::Bottom); - connect(_leftTW, TQT_SIGNAL(currentChanged(TQWidget*)), - this, TQT_SLOT(tabChanged(TQWidget*))); - connect(_leftTW, TQT_SIGNAL(visibleRectChanged(TabWidget*)), - this, TQT_SLOT(visibleRectChangedSlot(TabWidget*))); + connect(_leftTW, TQ_SIGNAL(currentChanged(TQWidget*)), + this, TQ_SLOT(tabChanged(TQWidget*))); + connect(_leftTW, TQ_SIGNAL(visibleRectChanged(TabWidget*)), + this, TQ_SLOT(visibleRectChangedSlot(TabWidget*))); _bottomTW = new TabWidget(this, _bottomSplitter, "Bottom"); _bottomTW->setTabPosition(TQTabWidget::Bottom); - connect(_bottomTW, TQT_SIGNAL(currentChanged(TQWidget*)), - this, TQT_SLOT(tabChanged(TQWidget*))); - connect(_bottomTW, TQT_SIGNAL(visibleRectChanged(TabWidget*)), - this, TQT_SLOT(visibleRectChangedSlot(TabWidget*))); + connect(_bottomTW, TQ_SIGNAL(currentChanged(TQWidget*)), + this, TQ_SLOT(tabChanged(TQWidget*))); + connect(_bottomTW, TQ_SIGNAL(visibleRectChanged(TabWidget*)), + this, TQ_SLOT(visibleRectChangedSlot(TabWidget*))); // default positions... diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp index b9675a0e..fc362e0f 100644 --- a/tdecachegrind/tdecachegrind/toplevel.cpp +++ b/tdecachegrind/tdecachegrind/toplevel.cpp @@ -82,17 +82,17 @@ TopLevel::TopLevel(const char *name) _stackDockShown->setChecked(!_stackDock->isHidden()); _functionDockShown->setChecked(!_functionDock->isHidden()); - connect(_partDock, TQT_SIGNAL(visibilityChanged(bool)), - TQT_TQOBJECT(this), TQT_SLOT(partVisibilityChanged(bool))); - connect(_stackDock, TQT_SIGNAL(visibilityChanged(bool)), - TQT_TQOBJECT(this), TQT_SLOT(stackVisibilityChanged(bool))); - connect(_functionDock, TQT_SIGNAL(visibilityChanged(bool)), - TQT_TQOBJECT(this), TQT_SLOT(functionVisibilityChanged(bool))); + connect(_partDock, TQ_SIGNAL(visibilityChanged(bool)), + this, TQ_SLOT(partVisibilityChanged(bool))); + connect(_stackDock, TQ_SIGNAL(visibilityChanged(bool)), + this, TQ_SLOT(stackVisibilityChanged(bool))); + connect(_functionDock, TQ_SIGNAL(visibilityChanged(bool)), + this, TQ_SLOT(functionVisibilityChanged(bool))); #if ENABLE_DUMPDOCK _dumpDockShown->setChecked(!_dumpDock->isHidden()); - connect(_dumpDock, TQT_SIGNAL(visibilityChanged(bool)), - TQT_TQOBJECT(this), TQT_SLOT(dumpVisibilityChanged(bool))); + connect(_dumpDock, TQ_SIGNAL(visibilityChanged(bool)), + this, TQ_SLOT(dumpVisibilityChanged(bool))); #endif _statusbar = statusBar(); @@ -134,7 +134,7 @@ TopLevel::TopLevel(const char *name) // if this is the first toplevel, show tip of day if (memberList->count() == 1) - TQTimer::singleShot( 200, TQT_TQOBJECT(this), TQT_SLOT(slotShowTipOnStart()) ); + TQTimer::singleShot( 200, this, TQ_SLOT(slotShowTipOnStart()) ); } void TopLevel::init() @@ -173,23 +173,23 @@ void TopLevel::setupPartSelection(PartSelection* ps) { // setup connections from the part selection widget - connect(ps, TQT_SIGNAL(activePartsChanged(const TracePartList&)), - TQT_TQOBJECT(this), TQT_SLOT(activePartsChangedSlot(const TracePartList&))); - connect(ps, TQT_SIGNAL(groupChanged(TraceCostItem*)), - TQT_TQOBJECT(this), TQT_SLOT(setGroupDelayed(TraceCostItem*))); - connect(ps, TQT_SIGNAL(functionChanged(TraceItem*)), - TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed(TraceItem*))); + connect(ps, TQ_SIGNAL(activePartsChanged(const TracePartList&)), + this, TQ_SLOT(activePartsChangedSlot(const TracePartList&))); + connect(ps, TQ_SIGNAL(groupChanged(TraceCostItem*)), + this, TQ_SLOT(setGroupDelayed(TraceCostItem*))); + connect(ps, TQ_SIGNAL(functionChanged(TraceItem*)), + this, TQ_SLOT(setTraceItemDelayed(TraceItem*))); - connect(ps, TQT_SIGNAL(goBack()), - _stackSelection, TQT_SLOT(browserBack())); + connect(ps, TQ_SIGNAL(goBack()), + _stackSelection, TQ_SLOT(browserBack())); - connect(ps, TQT_SIGNAL(partsHideSelected()), - TQT_TQOBJECT(this), TQT_SLOT(partsHideSelectedSlotDelayed())); - connect(ps, TQT_SIGNAL(partsUnhideAll()), - TQT_TQOBJECT(this), TQT_SLOT(partsUnhideAllSlotDelayed())); + connect(ps, TQ_SIGNAL(partsHideSelected()), + this, TQ_SLOT(partsHideSelectedSlotDelayed())); + connect(ps, TQ_SIGNAL(partsUnhideAll()), + this, TQ_SLOT(partsUnhideAllSlotDelayed())); - connect(ps, TQT_SIGNAL(showMessage(const TQString&, int)), - _statusbar, TQT_SLOT(message(const TQString&, int))); + connect(ps, TQ_SIGNAL(showMessage(const TQString&, int)), + _statusbar, TQ_SLOT(message(const TQString&, int))); } /** @@ -321,8 +321,8 @@ void TopLevel::createDocks() "cost used for all calls from the function in the line " "above.</p>")); - connect(_stackSelection, TQT_SIGNAL(functionSelected(TraceItem*)), - TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed(TraceItem*))); + connect(_stackSelection, TQ_SIGNAL(functionSelected(TraceItem*)), + this, TQ_SLOT(setTraceItemDelayed(TraceItem*))); _functionDock = new TQDockWindow(TQDockWindow::InDock, this); _functionDock->setCaption(i18n("Flat Profile")); @@ -415,8 +415,8 @@ void TopLevel::createDocks() setAppropriate(_dumpDock, true); setAppropriate(_functionDock, true); - connect( _partDock, TQT_SIGNAL(contextMenuRequested(const TQPoint &)), - TQT_TQOBJECT(this), TQT_SLOT(showDockMenu(const TQPoint &))); + connect( _partDock, TQ_SIGNAL(contextMenuRequested(const TQPoint &)), + this, TQ_SLOT(showDockMenu(const TQPoint &))); #endif } @@ -449,14 +449,14 @@ void TopLevel::createLayoutActions() action = new TDEAction( i18n( "&Duplicate" ), TDEShortcut(KKey("Ctrl+Plus")), - TQT_TQOBJECT(this), TQT_SLOT(layoutDuplicate()), + this, TQ_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 TDEAction( i18n( "&Remove" ), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(layoutRemove()), + this, TQ_SLOT(layoutRemove()), actionCollection(), "layout_remove" ); hint = i18n("<b>Remove Current Layout</b>" "<p>Delete current layout and make the previous active.</p>"); @@ -464,26 +464,26 @@ void TopLevel::createLayoutActions() action = new TDEAction( i18n( "&Go to Next" ), TDEShortcut(KKey("Ctrl+Right")), - TQT_TQOBJECT(this), TQT_SLOT(layoutNext()), + this, TQ_SLOT(layoutNext()), actionCollection(), "layout_next" ); hint = i18n("Go to Next Layout"); action->setWhatsThis( hint ); action = new TDEAction( i18n( "&Go to Previous" ), TDEShortcut(KKey("Ctrl+Left")), - TQT_TQOBJECT(this), TQT_SLOT(layoutPrevious()), + this, TQ_SLOT(layoutPrevious()), actionCollection(), "layout_previous" ); hint = i18n("Go to Previous Layout"); action->setWhatsThis( hint ); action = new TDEAction( i18n( "&Restore to Default" ), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(layoutRestore()), + this, TQ_SLOT(layoutRestore()), actionCollection(), "layout_restore" ); hint = i18n("Restore Layouts to Default"); action->setWhatsThis( hint ); action = new TDEAction( i18n( "&Save as Default" ), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(layoutSave()), + this, TQ_SLOT(layoutSave()), actionCollection(), "layout_save" ); hint = i18n("Save Layouts as Default"); action->setWhatsThis( hint ); @@ -495,12 +495,12 @@ void TopLevel::createMiscActions() TQString hint; TDEAction* action; - action = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(newWindow()), actionCollection()); + action = KStdAction::openNew(this, TQ_SLOT(newWindow()), actionCollection()); hint = i18n("<b>New</b><p>Open new empty KCachegrind window.</p>"); action->setWhatsThis( hint ); action = new TDEAction( i18n( "&Add..." ), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(addTrace()), + this, TQ_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>"); @@ -513,13 +513,13 @@ void TopLevel::createMiscActions() #else TDEStdAccel::key(TDEStdAccel::Reload), #endif - TQT_TQOBJECT(this), TQT_SLOT( reload() ), actionCollection(), "reload" ); + this, TQ_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 TDEAction( i18n( "&Export Graph" ), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(exportGraph()), + this, TQ_SLOT(exportGraph()), actionCollection(), "export" ); hint = i18n("<b>Export Call Graph</b>" @@ -535,7 +535,7 @@ void TopLevel::createMiscActions() #else TDEStdAccel::key(TDEStdAccel::Redo), #endif - TQT_TQOBJECT(this), TQT_SLOT( forceTrace() ), + this, TQ_SLOT( forceTrace() ), actionCollection(), "dump" ); hint = i18n("<b>Force Dump</b>" "<p>This forces a dump for a Callgrind profile run " @@ -561,20 +561,20 @@ void TopLevel::createMiscActions() "of the program.</p>"); _taDump->setWhatsThis( hint ); - action = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(loadTrace()), actionCollection()); + action = KStdAction::open(this, TQ_SLOT(loadTrace()), actionCollection()); hint = i18n("<b>Open Profile Data</b>" "<p>This opens a profile data file, with possible multiple parts</p>"); action->setToolTip( hint ); action->setWhatsThis( hint ); - _openRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(loadTrace(const KURL&)), + _openRecent = KStdAction::openRecent(this, TQ_SLOT(loadTrace(const KURL&)), actionCollection()); - KStdAction::showStatusbar(TQT_TQOBJECT(this), - TQT_SLOT(toggleStatusBar()), actionCollection()); + KStdAction::showStatusbar(this, + TQ_SLOT(toggleStatusBar()), actionCollection()); _partDockShown = new TDEToggleAction(i18n("Parts Overview"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(togglePartDock()), + this, TQ_SLOT(togglePartDock()), actionCollection(), "settings_show_partdock"); @@ -583,7 +583,7 @@ void TopLevel::createMiscActions() _partDockShown->setWhatsThis( hint ); _stackDockShown = new TDEToggleAction(i18n("Call Stack"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(toggleStackDock()), + this, TQ_SLOT(toggleStackDock()), actionCollection(), "settings_show_stackdock"); @@ -592,7 +592,7 @@ void TopLevel::createMiscActions() _stackDockShown->setWhatsThis( hint ); _functionDockShown = new TDEToggleAction(i18n("Function Profile"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(toggleFunctionDock()), + this, TQ_SLOT(toggleFunctionDock()), actionCollection(), "settings_show_profiledock"); @@ -602,7 +602,7 @@ void TopLevel::createMiscActions() #if ENABLE_DUMPDOCK _dumpDockShown = new TDEToggleAction(i18n("Profile Dumps"), TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(toggleDumpDock()), + this, TQ_SLOT(toggleDumpDock()), actionCollection(), "settings_show_dumpdock"); @@ -613,7 +613,7 @@ void TopLevel::createMiscActions() _taPercentage = new TDEToggleAction(i18n("Show Relative Costs"), "percent", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(togglePercentage()), + this, TQ_SLOT(togglePercentage()), actionCollection(), "view_percentage"); #if TDE_VERSION >= 0x030290 @@ -627,7 +627,7 @@ void TopLevel::createMiscActions() _taExpanded = new TDEToggleAction(i18n("Percentage Relative to Parent"), "move", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(toggleExpanded()), + this, TQ_SLOT(toggleExpanded()), actionCollection(), "view_expanded"); @@ -652,7 +652,7 @@ void TopLevel::createMiscActions() _taCycles = new TDEToggleAction( i18n( "Do Cycle Detection" ), "edit-undo", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT( toggleCycles() ), actionCollection(), + this, TQ_SLOT( toggleCycles() ), actionCollection(), "view_cycles" ); #if TDE_VERSION >= 0x030290 // for KDE 3.3: show another text instead of a checkmark @@ -673,25 +673,25 @@ void TopLevel::createMiscActions() "is the option to switch this off."); _taCycles->setWhatsThis( hint ); - KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); - KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(configure()), actionCollection()); - KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configureKeys()), actionCollection()); - KStdAction::configureToolbars(TQT_TQOBJECT(this),TQT_SLOT(configureToolbars()), + KStdAction::quit(this, TQ_SLOT(close()), actionCollection()); + KStdAction::preferences(this, TQ_SLOT(configure()), actionCollection()); + KStdAction::keyBindings(this, TQ_SLOT(configureKeys()), actionCollection()); + KStdAction::configureToolbars(this,TQ_SLOT(configureToolbars()), actionCollection()); #if 0 - action = KStdAction::back(_stackSelection, TQT_SLOT(browserBack()), + action = KStdAction::back(_stackSelection, TQ_SLOT(browserBack()), actionCollection()); hint = i18n("Go back in function selection history"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = KStdAction::forward(_stackSelection, TQT_SLOT(browserForward()), + action = KStdAction::forward(_stackSelection, TQ_SLOT(browserForward()), actionCollection()); hint = i18n("Go forward in function selection history"); action->setToolTip( hint ); action->setWhatsThis( hint ); - action = KStdAction::up(_stackSelection, TQT_SLOT(browserUp()), + action = KStdAction::up(_stackSelection, TQ_SLOT(browserUp()), actionCollection()); hint = i18n("<b>Go Up</b>" "<p>Go to last selected caller of current function. " @@ -701,12 +701,12 @@ void TopLevel::createMiscActions() #else _paUp = new TDEToolBarPopupAction( i18n( "&Up" ), "go-up", ALT+Key_Up, - TQT_TQOBJECT(_stackSelection), TQT_SLOT( browserUp() ), + _stackSelection, TQ_SLOT( browserUp() ), actionCollection(), "go_up" ); - connect( _paUp->popupMenu(), TQT_SIGNAL( aboutToShow() ), - TQT_TQOBJECT(this), TQT_SLOT( upAboutToShow() ) ); - connect( _paUp->popupMenu(), TQT_SIGNAL( activated( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( upActivated( int ) ) ); + connect( _paUp->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( upAboutToShow() ) ); + connect( _paUp->popupMenu(), TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( upActivated( int ) ) ); hint = i18n("<b>Go Up</b>" "<p>Go to last selected caller of current function. " "If no caller was visited, use that with highest cost.</p>"); @@ -715,24 +715,24 @@ void TopLevel::createMiscActions() TQPair< KGuiItem, KGuiItem > backForward = KStdGuiItem::backAndForward(); _paBack = new TDEToolBarPopupAction( backForward.first, ALT+Key_Left, - TQT_TQOBJECT(_stackSelection), TQT_SLOT(browserBack()), + _stackSelection, TQ_SLOT(browserBack()), actionCollection(), "go_back" ); - connect( _paBack->popupMenu(), TQT_SIGNAL( aboutToShow() ), - TQT_TQOBJECT(this), TQT_SLOT( backAboutToShow() ) ); - connect( _paBack->popupMenu(), TQT_SIGNAL( activated( int ) ), - TQT_TQOBJECT(this), TQT_SLOT( backActivated( int ) ) ); + connect( _paBack->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( backAboutToShow() ) ); + connect( _paBack->popupMenu(), TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( backActivated( int ) ) ); hint = i18n("Go back in function selection history"); _paBack->setToolTip( hint ); _paBack->setWhatsThis( hint ); _paForward = new TDEToolBarPopupAction( backForward.second, ALT+Key_Right, - TQT_TQOBJECT(_stackSelection), - TQT_SLOT(browserForward()), + _stackSelection, + TQ_SLOT(browserForward()), actionCollection(), "go_forward" ); - connect( _paForward->popupMenu(), TQT_SIGNAL( aboutToShow() ), - this, TQT_SLOT( forwardAboutToShow() ) ); - connect( _paForward->popupMenu(), TQT_SIGNAL( activated( int ) ), - this, TQT_SLOT( forwardActivated( int ) ) ); + connect( _paForward->popupMenu(), TQ_SIGNAL( aboutToShow() ), + this, TQ_SLOT( forwardAboutToShow() ) ); + connect( _paForward->popupMenu(), TQ_SIGNAL( activated( int ) ), + this, TQ_SLOT( forwardActivated( int ) ) ); hint = i18n("Go forward in function selection history"); _paForward->setToolTip( hint ); _paForward->setWhatsThis( hint ); @@ -747,8 +747,8 @@ void TopLevel::createMiscActions() // 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&))); + connect( _saCost, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(costTypeSelected(const TQString&))); _saCost2 = new TDESelectAction( i18n("Secondary Event Type"), TDEShortcut(), actionCollection(), "view_cost_type2"); @@ -757,8 +757,8 @@ void TopLevel::createMiscActions() _saCost2->setToolTip( hint ); _saCost2->setWhatsThis( hint ); - connect( _saCost2, TQT_SIGNAL(activated(const TQString&)), - TQT_TQOBJECT(this), TQT_SLOT(costType2Selected(const TQString&))); + connect( _saCost2, TQ_SIGNAL(activated(const TQString&)), + this, TQ_SLOT(costType2Selected(const TQString&))); saGroup = new TDESelectAction( i18n("Grouping"), TDEShortcut(), actionCollection(), "view_group_type"); @@ -776,11 +776,11 @@ void TopLevel::createMiscActions() << TraceCost::i18nTypeName(TraceItem::FunctionCycle); saGroup->setItems(args); - connect( saGroup, TQT_SIGNAL(activated(int)), - TQT_TQOBJECT(this), TQT_SLOT(groupTypeSelected(int))); + connect( saGroup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(groupTypeSelected(int))); _taSplit = new TDEToggleAction(i18n("Split"), "view_left_right", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(splitSlot()), + this, TQ_SLOT(splitSlot()), actionCollection(), "view_split"); hint = i18n("Show two information panels"); @@ -789,7 +789,7 @@ void TopLevel::createMiscActions() _taSplitDir = new TDEToggleAction(i18n("Split Horizontal"), "view_left_right", TDEShortcut(), - TQT_TQOBJECT(this), TQT_SLOT(splitDirSlot()), + this, TQ_SLOT(splitDirSlot()), actionCollection(), "view_split_dir"); hint = i18n("Change Split Orientation when main window is split."); @@ -798,11 +798,11 @@ void TopLevel::createMiscActions() // copied from KMail... #if TDE_VERSION >= 308 // KDE 3.1 - KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( slotShowTip() ), actionCollection() ); + KStdAction::tipOfDay( this, TQ_SLOT( slotShowTip() ), actionCollection() ); #else (void) new TDEAction( KGuiItem( i18n("Tip of the &Day..."), "idea", i18n("Show \"Tip of the Day\"") ), - 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowTip()), + 0, this, TQ_SLOT(slotShowTip()), actionCollection(), "help_show_tip" ); #endif } @@ -1102,7 +1102,7 @@ void TopLevel::addTrace(TQString file) void TopLevel::loadDelayed(TQString file) { _loadTraceDelayed = file; - TQTimer::singleShot(0, TQT_TQOBJECT(this), TQT_SLOT(loadTraceDelayed())); + TQTimer::singleShot(0, this, TQ_SLOT(loadTraceDelayed())); } void TopLevel::loadTraceDelayed() @@ -1381,13 +1381,13 @@ bool TopLevel::setFunction(TraceFunction* f) void TopLevel::setCostTypeDelayed(TraceCostType* ct) { _costTypeDelayed = ct; - TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setCostTypeDelayed())); + TQTimer::singleShot (0, this, TQ_SLOT(setCostTypeDelayed())); } void TopLevel::setCostType2Delayed(TraceCostType* ct) { _costType2Delayed = ct; - TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setCostType2Delayed())); + TQTimer::singleShot (0, this, TQ_SLOT(setCostType2Delayed())); } void TopLevel::setCostTypeDelayed() @@ -1403,7 +1403,7 @@ void TopLevel::setCostType2Delayed() void TopLevel::setGroupTypeDelayed(TraceItem::CostType gt) { _groupTypeDelayed = gt; - TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setGroupTypeDelayed())); + TQTimer::singleShot (0, this, TQ_SLOT(setGroupTypeDelayed())); } void TopLevel::setGroupTypeDelayed() @@ -1420,7 +1420,7 @@ void TopLevel::setGroupDelayed(TraceCostItem* g) #endif _groupDelayed = g; - TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setGroupDelayed())); + TQTimer::singleShot (0, this, TQ_SLOT(setGroupDelayed())); } void TopLevel::setGroupDelayed() @@ -1431,7 +1431,7 @@ void TopLevel::setGroupDelayed() void TopLevel::setDirectionDelayed(TraceItemView::Direction d) { _directionDelayed = d; - TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setDirectionDelayed())); + TQTimer::singleShot (0, this, TQ_SLOT(setDirectionDelayed())); } void TopLevel::setDirectionDelayed() @@ -1479,7 +1479,7 @@ void TopLevel::setTraceItemDelayed(TraceItem* i) _lastSender ? _lastSender->name() :"0" ); #endif - TQTimer::singleShot (0, TQT_TQOBJECT(this), TQT_SLOT(setTraceItemDelayed())); + TQTimer::singleShot (0, this, TQ_SLOT(setTraceItemDelayed())); } void TopLevel::setTraceItemDelayed() @@ -1644,18 +1644,18 @@ void TopLevel::addCostMenu(TQPopupMenu* popup, bool withCost2) } } popup->insertItem(i18n("Primary Event Type"), popup1); - connect(popup1,TQT_SIGNAL(activated(int)),this,TQT_SLOT(setCostType(int))); + connect(popup1,TQ_SIGNAL(activated(int)),this,TQ_SLOT(setCostType(int))); if (popup2) { popup->insertItem(i18n("Secondary Event Type"), popup2); - connect(popup2,TQT_SIGNAL(activated(int)),this,TQT_SLOT(setCostType2(int))); + connect(popup2,TQ_SIGNAL(activated(int)),this,TQ_SLOT(setCostType2(int))); } } if (_showPercentage) popup->insertItem(i18n("Show Absolute Cost"), - TQT_TQOBJECT(this), TQT_SLOT(setAbsoluteCost())); + this, TQ_SLOT(setAbsoluteCost())); else popup->insertItem(i18n("Show Relative Cost"), - TQT_TQOBJECT(this), TQT_SLOT(setRelativeCost())); + this, TQ_SLOT(setRelativeCost())); } bool TopLevel::setCostType(int id) @@ -1684,9 +1684,9 @@ bool TopLevel::setCostType2(int id) void TopLevel::addGoMenu(TQPopupMenu* popup) { - popup->insertItem(i18n("Go Back"), TQT_TQOBJECT(this), TQT_SLOT(goBack())); - popup->insertItem(i18n("Go Forward"), TQT_TQOBJECT(this), TQT_SLOT(goForward())); - popup->insertItem(i18n("Go Up"), TQT_TQOBJECT(this), TQT_SLOT(goUp())); + popup->insertItem(i18n("Go Back"), this, TQ_SLOT(goBack())); + popup->insertItem(i18n("Go Forward"), this, TQ_SLOT(goForward())); + popup->insertItem(i18n("Go Up"), this, TQ_SLOT(goUp())); } void TopLevel::goBack() @@ -2098,7 +2098,7 @@ void TopLevel::activePartsChangedSlot(const TracePartList& list) void TopLevel::partsHideSelectedSlotDelayed() { - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(partsHideSelectedSlot()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(partsHideSelectedSlot()) ); } // this puts selected parts into hidden list, @@ -2131,7 +2131,7 @@ void TopLevel::partsHideSelectedSlot() void TopLevel::partsUnhideAllSlotDelayed() { - TQTimer::singleShot( 0, TQT_TQOBJECT(this), TQT_SLOT(partsUnhideAllSlot()) ); + TQTimer::singleShot( 0, this, TQ_SLOT(partsUnhideAllSlot()) ); } // this unhides all hidden parts. Does NOT change selection @@ -2159,7 +2159,7 @@ void TopLevel::forceTrace() cmd.close(); } if (_taDump->isChecked()) - TQTimer::singleShot( 1000, TQT_TQOBJECT(this), TQT_SLOT(forceTraceReload()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(forceTraceReload()) ); else { // cancel request cmd.remove(); @@ -2174,7 +2174,7 @@ void TopLevel::forceTraceReload() TQFile cmd("callgrind.cmd"); if (cmd.exists()) { if (_taDump->isChecked()) - TQTimer::singleShot( 1000, TQT_TQOBJECT(this), TQT_SLOT(forceTraceReload()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(forceTraceReload()) ); return; } _taDump->setChecked(false); diff --git a/tdecachegrind/tdecachegrind/tracedata.cpp b/tdecachegrind/tdecachegrind/tracedata.cpp index da0726bb..020fa685 100644 --- a/tdecachegrind/tdecachegrind/tracedata.cpp +++ b/tdecachegrind/tdecachegrind/tracedata.cpp @@ -4547,8 +4547,8 @@ TracePart* TraceData::addPart(const TQString& dir, const TQString& name) if (!l) return 0; if (_topLevel) - _topLevel->connect(l, TQT_SIGNAL(updateStatus(TQString, int)), - TQT_SLOT(showStatus(TQString, int))); + _topLevel->connect(l, TQ_SIGNAL(updateStatus(TQString, int)), + TQ_SLOT(showStatus(TQString, int))); TracePart* part = new TracePart(this, file); diff --git a/tdecachegrind/tdecachegrind/treemap.cpp b/tdecachegrind/tdecachegrind/treemap.cpp index bcffbd21..ae8d2fc3 100644 --- a/tdecachegrind/tdecachegrind/treemap.cpp +++ b/tdecachegrind/tdecachegrind/treemap.cpp @@ -1794,7 +1794,7 @@ void TreeMapWidget::contextMenuEvent( TQContextMenuEvent* e ) { //kdDebug(90100) << "TreeMapWidget::contextMenuEvent" << endl; - if ( receivers( TQT_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) + if ( receivers( TQ_SIGNAL(contextMenuRequested(TreeMapItem*, const TQPoint &)) ) ) e->accept(); if ( e->reason() == TQContextMenuEvent::Keyboard ) { @@ -2803,8 +2803,8 @@ void TreeMapWidget::addSplitDirectionItems(TQPopupMenu* popup, int id) _splitID = id; popup->setCheckable(true); - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(splitActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(splitActivated(int))); popup->insertItem(i18n("Recursive Bisection"), id); popup->insertItem(i18n("Columns"), id+1); @@ -2862,10 +2862,10 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id) TQPopupMenu* bpopup = new TQPopupMenu(); bpopup->setCheckable(true); - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(visualizationActivated(int))); - connect(bpopup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(visualizationActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(visualizationActivated(int))); + connect(bpopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(visualizationActivated(int))); TQPopupMenu* spopup = new TQPopupMenu(); addSplitDirectionItems(spopup, id+100); @@ -2925,8 +2925,8 @@ void TreeMapWidget::addVisualizationItems(TQPopupMenu* popup, int id) tpopup->setItemChecked(id+7,_attr[f].pos == DrawParams::BottomCenter); tpopup->setItemChecked(id+8,_attr[f].pos == DrawParams::BottomRight); - connect(tpopup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(visualizationActivated(int))); + connect(tpopup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(visualizationActivated(int))); } } @@ -2950,8 +2950,8 @@ void TreeMapWidget::addSelectionItems(TQPopupMenu* popup, _selectionID = id; _menuItem = i; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(selectionActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(selectionActivated(int))); while (i) { TQString name = i->text(0); @@ -2981,8 +2981,8 @@ void TreeMapWidget::addFieldStopItems(TQPopupMenu* popup, { _fieldStopID = id; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(fieldStopActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(fieldStopActivated(int))); popup->insertItem(i18n("No %1 Limit").arg(fieldType(0)), id); popup->setItemChecked(id, fieldStop(0).isEmpty()); @@ -3031,8 +3031,8 @@ void TreeMapWidget::addAreaStopItems(TQPopupMenu* popup, _areaStopID = id; _menuItem = i; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(areaStopActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(areaStopActivated(int))); bool foundArea = false; @@ -3093,8 +3093,8 @@ void TreeMapWidget::addDepthStopItems(TQPopupMenu* popup, _depthStopID = id; _menuItem = i; - connect(popup, TQT_SIGNAL(activated(int)), - this, TQT_SLOT(depthStopActivated(int))); + connect(popup, TQ_SIGNAL(activated(int)), + this, TQ_SLOT(depthStopActivated(int))); bool foundDepth = false; diff --git a/tdefile-plugins/diff/tdefile_diff.cpp b/tdefile-plugins/diff/tdefile_diff.cpp index 9ebade6d..17f594e3 100644 --- a/tdefile-plugins/diff/tdefile_diff.cpp +++ b/tdefile-plugins/diff/tdefile_diff.cpp @@ -37,7 +37,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <tdelocale.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <kurl.h> #include "tdefile_diff.h" diff --git a/tdeioslave/svn/ksvnd/ksvnd.cpp b/tdeioslave/svn/ksvnd/ksvnd.cpp index 82e51bbb..f5ad3888 100644 --- a/tdeioslave/svn/ksvnd/ksvnd.cpp +++ b/tdeioslave/svn/ksvnd/ksvnd.cpp @@ -31,7 +31,7 @@ #include "commitdlg.h" extern "C" { - KDE_EXPORT KDEDModule *create_ksvnd(const TQCString &name) { + TDE_EXPORT KDEDModule *create_ksvnd(const TQCString &name) { return new KSvnd(name); } } diff --git a/tdeioslave/svn/svn.cpp b/tdeioslave/svn/svn.cpp index a25abe36..dcf802c0 100644 --- a/tdeioslave/svn/svn.cpp +++ b/tdeioslave/svn/svn.cpp @@ -32,9 +32,9 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdemessagebox.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeglobal.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdelocale.h> #include <kurl.h> #include <ksock.h> @@ -96,7 +96,7 @@ open_tmp_file (apr_file_t **fp, /* Open a unique file; use APR_DELONCLOSE. */ SVN_ERR (svn_io_open_unique_file (fp, &ignored_filename, - truepath, ".tmp", TRUE, pool)); + truepath, ".tmp", true, pool)); return SVN_NO_ERROR; } @@ -131,7 +131,7 @@ apr_array_header_t* svn_sort__hash(apr_hash_t *ht, ary = apr_array_make(pool, apr_hash_count(ht), sizeof(svn_sort_item_type)); /* loop over hash table and push all keys into the array */ - sorted = TRUE; + sorted = true; prev_item = NULL; for (hi = apr_hash_first(pool, ht); hi; hi = apr_hash_next(hi)) { @@ -241,13 +241,13 @@ void tdeio_svnProtocol::initNotifier(bool is_checkout, bool is_export, bool supp ctx->notify_func = tdeio_svnProtocol::notify; struct notify_baton *nb = ( struct notify_baton* )apr_palloc(spool, sizeof( *nb ) ); nb->master = this; - nb->received_some_change = FALSE; - nb->sent_first_txdelta = FALSE; + nb->received_some_change = false; + nb->sent_first_txdelta = false; nb->is_checkout = is_checkout; nb->is_export = is_export; nb->suppress_final_line = suppress_final_line; - nb->in_external = FALSE; - nb->had_print_error = FALSE; + nb->in_external = false; + nb->had_print_error = false; nb->pool = svn_pool_create (spool); ctx->notify_baton = nb; @@ -953,7 +953,7 @@ void tdeio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, i << endl ; apr_pool_t *subpool = svn_pool_create (pool); - apr_array_header_t *options = svn_cstring_split( "", "\t\r\n", TRUE, subpool ); + apr_array_header_t *options = svn_cstring_split( "", "\t\r\n", true, subpool ); KURL nurl1 = url1; KURL nurl2 = url2; @@ -1230,7 +1230,7 @@ void tdeio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecu apr_pool_t *subpool = svn_pool_create (pool); svn_revnum_t result_rev; - bool no_ignore = FALSE; + bool no_ignore = false; KURL nurl = wc; nurl.setProtocol( "file" ); @@ -1304,7 +1304,7 @@ TQString tdeio_svnProtocol::chooseProtocol ( const TQString& kproto ) const { svn_error_t *tdeio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t **cred_p, void *, const char */*realm*/, apr_uint32_t /*failures*/, const svn_auth_ssl_server_cert_info_t */*cert_info*/, svn_boolean_t /*may_save*/, apr_pool_t *pool) { //when ksvnd is ready make it prompt for the SSL certificate ... XXX *cred_p = (svn_auth_cred_ssl_server_trust_t*)apr_pcalloc (pool, sizeof (**cred_p)); - (*cred_p)->may_save = FALSE; + (*cred_p)->may_save = false; return SVN_NO_ERROR; } @@ -1407,7 +1407,7 @@ void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_acti case svn_wc_notify_copy: //copy break; case svn_wc_notify_delete: //delete - nb->received_some_change = TRUE; + nb->received_some_change = true; userstring = i18n( "D %1" ).arg( path ); break; case svn_wc_notify_restore : //restore @@ -1429,11 +1429,11 @@ void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_acti userstring=i18n("Skipped %1.").arg( path ); break; case svn_wc_notify_update_delete: //update_delete - nb->received_some_change = TRUE; + nb->received_some_change = true; userstring=i18n( "D %1" ).arg( path ); break; case svn_wc_notify_update_add: //update_add - nb->received_some_change = TRUE; + nb->received_some_change = true; userstring=i18n( "A %1" ).arg( path ); break; case svn_wc_notify_update_update: //update_update @@ -1445,7 +1445,7 @@ void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_acti && ((prop_state == svn_wc_notify_state_inapplicable) || (prop_state == svn_wc_notify_state_unknown) || (prop_state == svn_wc_notify_state_unchanged)))) { - nb->received_some_change = TRUE; + nb->received_some_change = true; if (kind == svn_node_file) { if (content_state == svn_wc_notify_state_conflicted) @@ -1521,10 +1521,10 @@ void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_acti } } if (nb->in_external) - nb->in_external = FALSE; + nb->in_external = false; break; case svn_wc_notify_update_external: //update_external - nb->in_external = TRUE; + nb->in_external = true; userstring = i18n("Fetching external item into %1." ).arg( path ); break; case svn_wc_notify_status_completed: //status_completed @@ -1552,7 +1552,7 @@ void tdeio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_acti break; case svn_wc_notify_commit_postfix_txdelta: //commit_postfix_txdelta if (! nb->sent_first_txdelta) { - nb->sent_first_txdelta = TRUE; + nb->sent_first_txdelta = true; userstring=i18n("Transmitting file data "); } else { userstring="."; @@ -1624,7 +1624,7 @@ void tdeio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) { extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv) { + TDE_EXPORT int kdemain(int argc, char **argv) { TDEInstance instance( "tdeio_svn" ); kdDebug(7128) << "*** Starting tdeio_svn " << endl; diff --git a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp index 26098adb..d7928bbc 100644 --- a/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp +++ b/tdeioslave/svn/svnhelper/tdeio_svn_helper.cpp @@ -38,17 +38,17 @@ #include "subversiondiff.h" #include <kurlrequester.h> #include <tqspinbox.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdetempfile.h> #include <tqtextstream.h> #include <tqtextedit.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqtextbrowser.h> #include <tqtextcodec.h> SvnHelper::SvnHelper():TDEApplication() { TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); - KWinModule wm ( TQT_TQOBJECT(this) ); + KWinModule wm ( this ); m_id = wm.activeWindow(); KURL::List list; @@ -67,7 +67,7 @@ SvnHelper::SvnHelper():TDEApplication() { kdDebug(7128) << "updating : " << (*it).prettyURL() << endl; s << cmd << *it << rev << TQString( "HEAD" ); TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); } } else if (args->isSet("c")) { @@ -82,7 +82,7 @@ SvnHelper::SvnHelper():TDEApplication() { s << *it; } TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); } else if (args->isSet("a")) { kdDebug(7128) << "add " << list << endl; @@ -94,7 +94,7 @@ SvnHelper::SvnHelper():TDEApplication() { kdDebug(7128) << "adding : " << (*it).prettyURL() << endl; s << cmd << *it; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); } } else if (args->isSet("D")) { @@ -111,7 +111,7 @@ SvnHelper::SvnHelper():TDEApplication() { TQString revkind2 = "WORKING"; s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); if ( diffresult.count() > 0 ) { //check kompare is available @@ -152,7 +152,7 @@ SvnHelper::SvnHelper():TDEApplication() { s << *it; } TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); } else if (args->isSet("s")) { kdDebug(7128) << "switch " << list << endl; @@ -179,7 +179,7 @@ SvnHelper::SvnHelper():TDEApplication() { s << revnumber; s << revkind; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); } } @@ -195,7 +195,7 @@ SvnHelper::SvnHelper():TDEApplication() { s << *it; } TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); } else if (args->isSet("C")) { kdDebug(7128) << "checkout " << list << endl; @@ -220,14 +220,14 @@ SvnHelper::SvnHelper():TDEApplication() { s << revkind; kdDebug(7128) << "checkouting : " << d.url->url() << " into " << (*it).prettyURL() << " at rev : " << rev << " or " << revkind << endl; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); } } } else { KMessageBox::sorry(0, "Sorry, request not recognised. Perhaps not implemented yet?", "Feature Not Implemented"); } - TQTimer::singleShot( 0, this, TQT_SLOT( finished() ) ); + TQTimer::singleShot( 0, this, TQ_SLOT( finished() ) ); } void SvnHelper::slotResult( TDEIO::Job* job ) { @@ -257,7 +257,7 @@ void SvnHelper::slotResult( TDEIO::Job* job ) { } void SvnHelper::finished() { - kapp->quit(); + tdeApp->quit(); } static TDECmdLineOptions options[] = { diff --git a/tdeunittest/guimodrunner.cpp b/tdeunittest/guimodrunner.cpp index d719069b..6be36a21 100644 --- a/tdeunittest/guimodrunner.cpp +++ b/tdeunittest/guimodrunner.cpp @@ -26,7 +26,7 @@ #include <kdebug.h> #include <tdeapplication.h> #include <tdeglobal.h> -#include <kinstance.h> +#include <tdeinstance.h> #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <tdelocale.h> diff --git a/tdeunittest/runnergui.cpp b/tdeunittest/runnergui.cpp index 2e9ca350..54d185b5 100644 --- a/tdeunittest/runnergui.cpp +++ b/tdeunittest/runnergui.cpp @@ -140,10 +140,10 @@ namespace KUnitTest // init the progress bar configureProgressBar(Runner::self()->numberOfTestCases(), 0); - connect(Runner::self(), TQT_SIGNAL(finished(const char *, Tester *)), this, TQT_SLOT(addTestResult(const char *, Tester *))); - connect(m_testerWidget->resultList(), TQT_SIGNAL(clicked(TQListViewItem *)), this, TQT_SLOT(showDetails(TQListViewItem *))); - connect(m_testerWidget, TQT_SIGNAL(run()), this, TQT_SLOT(runSuite())); - connect(m_testerWidget->details(), TQT_SIGNAL(doubleClicked(int, int)), this, TQT_SLOT(doubleClickedOnDetails(int, int))); + connect(Runner::self(), TQ_SIGNAL(finished(const char *, Tester *)), this, TQ_SLOT(addTestResult(const char *, Tester *))); + connect(m_testerWidget->resultList(), TQ_SIGNAL(clicked(TQListViewItem *)), this, TQ_SLOT(showDetails(TQListViewItem *))); + connect(m_testerWidget, TQ_SIGNAL(run()), this, TQ_SLOT(runSuite())); + connect(m_testerWidget->details(), TQ_SIGNAL(doubleClicked(int, int)), this, TQ_SLOT(doubleClickedOnDetails(int, int))); } RunnerGUI::~RunnerGUI() diff --git a/tdeunittest/runnergui.h b/tdeunittest/runnergui.h index 146e7d30..74770243 100644 --- a/tdeunittest/runnergui.h +++ b/tdeunittest/runnergui.h @@ -32,7 +32,7 @@ #include <tdeunittest/runner.h> #include <tdeunittest/tester.h> -#include <kdemacros.h> +#include <tdemacros.h> class TesterWidget; class TQTextEdit; @@ -41,7 +41,7 @@ namespace KUnitTest { class RunnerGUIDCOPImpl; - class KDE_EXPORT RunnerGUI : public TQHBox + class TDE_EXPORT RunnerGUI : public TQHBox { TQ_OBJECT diff --git a/tdeunittest/testerwidget.ui b/tdeunittest/testerwidget.ui index e6e92e1c..52ac9917 100644 --- a/tdeunittest/testerwidget.ui +++ b/tdeunittest/testerwidget.ui @@ -182,9 +182,9 @@ <includes> <include location="local" impldecl="in implementation">testerwidget.ui.h</include> </includes> -<Q_SIGNALS> +<signals> <signal>run()</signal> -</Q_SIGNALS> +</signals> <functions> <function access="private" specifier="non virtual">init()</function> <function returnType="TQListView *">resultList()</function> diff --git a/tdeunittest/testerwidget.ui.h b/tdeunittest/testerwidget.ui.h index f80a248d..e8c69c5b 100644 --- a/tdeunittest/testerwidget.ui.h +++ b/tdeunittest/testerwidget.ui.h @@ -13,7 +13,7 @@ void TesterWidget::init() { - connect(m_pshRun, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(run())); + connect(m_pshRun, TQ_SIGNAL(clicked()), this, TQ_SIGNAL(run())); } TQListView * TesterWidget::resultList() diff --git a/translations/desktop_files/cervisia-desktops/es_AR.po b/translations/desktop_files/cervisia-desktops/es_AR.po new file mode 100644 index 00000000..2ce63c27 --- /dev/null +++ b/translations/desktop_files/cervisia-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 15:51+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: cervisia.desktop:2 +msgid "Cervisia" +msgstr "" + +#. GenericName +#: cervisia.desktop:4 +msgid "CVS Frontend" +msgstr "" + +#. Name +#: cvsservice/cvsservice.desktop:2 +msgid "CvsService" +msgstr "" + +#. Comment +#: cvsservice/cvsservice.desktop:4 +msgid "A DCOP service that provides an interface to cvs" +msgstr "" diff --git a/translations/desktop_files/cervisia-desktops/ka.po b/translations/desktop_files/cervisia-desktops/ka.po index abed2596..5f241961 100644 --- a/translations/desktop_files/cervisia-desktops/ka.po +++ b/translations/desktop_files/cervisia-desktops/ka.po @@ -1,35 +1,36 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-16 15:51+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 16:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/cervisia-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: cervisia.desktop:2 msgid "Cervisia" -msgstr "" +msgstr "Cervisia" #. GenericName #: cervisia.desktop:4 msgid "CVS Frontend" -msgstr "" +msgstr "CVS-ის წინáƒáƒ‘áƒáƒšáƒ" #. Name #: cvsservice/cvsservice.desktop:2 msgid "CvsService" -msgstr "" +msgstr "CvsService" #. Comment #: cvsservice/cvsservice.desktop:4 diff --git a/translations/desktop_files/cervisia-eventsrc/es_AR.po b/translations/desktop_files/cervisia-eventsrc/es_AR.po new file mode 100644 index 00000000..2c0e5a42 --- /dev/null +++ b/translations/desktop_files/cervisia-eventsrc/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 15:54+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Comment +#: eventsrc:3 +msgid "Cervisia" +msgstr "" + +#. Name +#: eventsrc:6 +msgid "CVS commit job done" +msgstr "" + +#. Comment +#: eventsrc:7 +msgid "A CVS commit job is done" +msgstr "" diff --git a/translations/desktop_files/cervisia-eventsrc/ka.po b/translations/desktop_files/cervisia-eventsrc/ka.po index 4cd4e751..7ee51b37 100644 --- a/translations/desktop_files/cervisia-eventsrc/ka.po +++ b/translations/desktop_files/cervisia-eventsrc/ka.po @@ -1,32 +1,33 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-16 15:54+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 16:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/cervisia-events/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Comment #: eventsrc:3 msgid "Cervisia" -msgstr "" +msgstr "Cervisia" #. Name #: eventsrc:6 msgid "CVS commit job done" -msgstr "CVS შესრულებული დáƒáƒ•áƒáƒšáƒ”ბრშესრულდáƒ" +msgstr "CVS commit დáƒáƒ•áƒáƒšáƒ”ბრშესრულდáƒ" #. Comment #: eventsrc:7 msgid "A CVS commit job is done" -msgstr "CVS შესრულებული დáƒáƒ•áƒáƒšáƒ”ბრშესრულდáƒ" +msgstr "CVS commit დáƒáƒ•áƒáƒšáƒ”ბრშესრულდáƒ" diff --git a/translations/desktop_files/kbabel-desktops/de.po b/translations/desktop_files/kbabel-desktops/de.po index 85c46d97..1488f29f 100644 --- a/translations/desktop_files/kbabel-desktops/de.po +++ b/translations/desktop_files/kbabel-desktops/de.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Etienne Ruedin <ruedin@gmx.net>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-16 16:06+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-08-11 13:12+0000\n" +"Last-Translator: Etienne Ruedin <ruedin@gmx.net>\n" +"Language-Team: German <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/kbabel-desktop-files/de/>\n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: addons/preview/pothumbnail.desktop:2 @@ -29,12 +30,12 @@ msgstr "Katalog-Information" #. Name #: catalogmanager/catalogmanager.desktop:2 msgid "KBabel Catalog Manager" -msgstr "KBabel-Katalogmanager" +msgstr "KBabel-Katalogverwaltung" #. GenericName #: catalogmanager/catalogmanager.desktop:4 msgid "Translation Tool Catalog Manager" -msgstr "Katalogmanager für Ãœbersetzungsprogramm" +msgstr "Katalogverwaltung für Ãœbersetzungsprogramm" #. Comment #: common/kbabelfilter.desktop:2 diff --git a/translations/desktop_files/kbabel-desktops/es_AR.po b/translations/desktop_files/kbabel-desktops/es_AR.po new file mode 100644 index 00000000..c6892b84 --- /dev/null +++ b/translations/desktop_files/kbabel-desktops/es_AR.po @@ -0,0 +1,245 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 16:06+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: addons/preview/pothumbnail.desktop:2 +msgid "Message Catalogs" +msgstr "" + +#. Name +#: addons/tdefile-plugins/tdefile_po.desktop:2 +msgid "Catalog Information" +msgstr "" + +#. Name +#: catalogmanager/catalogmanager.desktop:2 +msgid "KBabel Catalog Manager" +msgstr "" + +#. GenericName +#: catalogmanager/catalogmanager.desktop:4 +msgid "Translation Tool Catalog Manager" +msgstr "" + +#. Comment +#: common/kbabelfilter.desktop:2 +msgid "KBabel filter" +msgstr "" + +#. Comment +#: commonui/kbabel_validator.desktop:2 +msgid "TDE Data Tool for KBabel" +msgstr "" + +#. Name +#: datatools/accelerators/kbabel_accelstool.desktop:2 +msgid "Accelerator Validation for KBabel" +msgstr "" + +#. Comment +#: datatools/accelerators/kbabel_accelstool.desktop:4 +msgid "Check Accelerators" +msgstr "" + +#. Name +#: datatools/arguments/kbabel_argstool.desktop:2 +msgid "Argument Validation for KBabel" +msgstr "" + +#. Comment +#: datatools/arguments/kbabel_argstool.desktop:4 +msgid "Check Arguments" +msgstr "" + +#. Name +#: datatools/context/kbabel_contexttool.desktop:2 +msgid "Translated Context Info Validation for KBabel" +msgstr "" + +#. Comment +#: datatools/context/kbabel_contexttool.desktop:4 +msgid "Look for Translated Context Info" +msgstr "" + +#. Name +#: datatools/equations/kbabel_equationstool.desktop:2 +msgid "Equation Validation for KBabel" +msgstr "" + +#. Comment +#: datatools/equations/kbabel_equationstool.desktop:4 +msgid "Check Equations" +msgstr "" + +#. Name +#: datatools/length/kbabel_lengthtool.desktop:2 +msgid "Translated Message Length Validator for KBabel" +msgstr "" + +#. Comment +#: datatools/length/kbabel_lengthtool.desktop:4 +msgid "Check Translated Message Length" +msgstr "" + +#. Name +#: datatools/not-translated/kbabel_nottranslatedtool.desktop:2 +msgid "Check for Translated Strings Containing English for KBabel" +msgstr "" + +#. Comment +#: datatools/not-translated/kbabel_nottranslatedtool.desktop:4 +msgid "Translations Containing English" +msgstr "" + +#. Name +#: datatools/pluralforms/kbabel_pluralformstool.desktop:2 +msgid "Plural Form Validation for KBabel" +msgstr "" + +#. Comment +#: datatools/pluralforms/kbabel_pluralformstool.desktop:4 +msgid "Check Plural Forms" +msgstr "" + +#. Name +#: datatools/punctuation/kbabel_punctuationtool.desktop:2 +msgid "Punctuation Validation for KBabel" +msgstr "" + +#. Comment +#: datatools/punctuation/kbabel_punctuationtool.desktop:4 +msgid "Check Punctuation" +msgstr "" + +#. Name +#: datatools/regexp/kbabel_regexptool.desktop:2 +msgid "Catalan Grammar" +msgstr "" + +#. Comment +#: datatools/regexp/kbabel_regexptool.desktop:4 +msgid "Check Translated Messages with a set of Regular Expressions" +msgstr "" + +#. Name +#: datatools/setfuzzy/kbabel_setfuzzytool.desktop:2 +msgid "Toggle Fuzzy Tool for KBabel" +msgstr "" + +#. Comment +#: datatools/setfuzzy/kbabel_setfuzzytool.desktop:4 +msgid "Set All Fuzzy" +msgstr "" + +#. Name +#: datatools/whitespace/kbabel_whitespacetool.desktop:2 +msgid "String Translated as Whitespace Validator for KBabel" +msgstr "" + +#. Comment +#: datatools/whitespace/kbabel_whitespacetool.desktop:4 +msgid "Whitespace Translations" +msgstr "" + +#. Name +#: datatools/xml/kbabel_xmltool.desktop:2 +msgid "XML Validation for KBabel" +msgstr "" + +#. Comment +#: datatools/xml/kbabel_xmltool.desktop:4 +msgid "Check Tags" +msgstr "" + +#. Name +#: filters/gettext/kbabel_gettext_export.desktop:2 +msgid "KBabel GNU Gettext Export Filter" +msgstr "" + +#. Name +#: filters/gettext/kbabel_gettext_import.desktop:2 +msgid "KBabel GNU Gettext Import Filter" +msgstr "" + +#. Name +#: filters/linguist/kbabel_linguist_export.desktop:2 +msgid "KBabel Linguist Export Filter" +msgstr "" + +#. Name +#: filters/linguist/kbabel_linguist_import.desktop:2 +msgid "KBabel Linguist Import Filter" +msgstr "" + +#. Name +#: filters/xliff/kbabel_xliff_export.desktop:2 +msgid "KBabel XLIFF Export Filter" +msgstr "" + +#. Name +#: filters/xliff/kbabel_xliff_import.desktop:2 +msgid "KBabel XLIFF Import Filter" +msgstr "" + +#. Name +#: kbabel/kbabel.desktop:2 +msgid "KBabel" +msgstr "" + +#. GenericName +#: kbabel/kbabel.desktop:4 +msgid "Translation Tool" +msgstr "" + +#. Name +#: kbabeldict/kbabeldict.desktop:2 +msgid "KBabel Dictionary" +msgstr "" + +#. GenericName +#: kbabeldict/kbabeldict.desktop:4 +msgid "Translation Tool Dictionary" +msgstr "" + +#. Comment +#: kbabeldict/kbabeldict_module.desktop:2 +msgid "Dictionary module for KBabelDict" +msgstr "" + +#. Name +#: kbabeldict/modules/dbsearchengine/dbsearchengine.desktop:2 +msgid "Translation Database for KBabelDict" +msgstr "" + +#. Name +#: kbabeldict/modules/dbsearchengine2/dbsearchengine2.desktop:2 +msgid "Translation Database v2 for KBabelDict" +msgstr "" + +#. Name +#: kbabeldict/modules/poauxiliary/poauxiliary.desktop:2 +msgid "Auxiliary PO Module for KBabelDict" +msgstr "" + +#. Name +#: kbabeldict/modules/pocompendium/pocompendium.desktop:2 +msgid "PO Compendium Module for KBabelDict" +msgstr "" + +#. Name +#: kbabeldict/modules/tmx/tmxcompendium.desktop:2 +msgid "TMX Compendium Module for KBabelDict" +msgstr "" diff --git a/translations/desktop_files/kbabel-desktops/ka.po b/translations/desktop_files/kbabel-desktops/ka.po index af2596de..7918d9b3 100644 --- a/translations/desktop_files/kbabel-desktops/ka.po +++ b/translations/desktop_files/kbabel-desktops/ka.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-16 16:06+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 16:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/kbabel-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: addons/preview/pothumbnail.desktop:2 @@ -198,9 +199,8 @@ msgstr "KBabel XLIFF იმპáƒáƒ ის ფილტრი" #. Name #: kbabel/kbabel.desktop:2 -#, fuzzy msgid "KBabel" -msgstr "KBabel ფილტრი" +msgstr "KBabel" #. GenericName #: kbabel/kbabel.desktop:4 diff --git a/translations/desktop_files/kbabel-desktops/ru.po b/translations/desktop_files/kbabel-desktops/ru.po index 315b5e81..9a0ffe28 100644 --- a/translations/desktop_files/kbabel-desktops/ru.po +++ b/translations/desktop_files/kbabel-desktops/ru.po @@ -1,20 +1,22 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Andrei Stepanov <adem4ik@gmail.com>, 2023. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-16 16:06+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2023-12-07 21:14+0000\n" +"Last-Translator: Andrei Stepanov <adem4ik@gmail.com>\n" +"Language-Team: Russian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/kbabel-desktop-files/ru/>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 4.17\n" #. Name #: addons/preview/pothumbnail.desktop:2 @@ -198,9 +200,8 @@ msgstr "Фильтр импорта XLIFF" #. Name #: kbabel/kbabel.desktop:2 -#, fuzzy msgid "KBabel" -msgstr "Фильтр KBabel" +msgstr "KBabel" #. GenericName #: kbabel/kbabel.desktop:4 diff --git a/translations/desktop_files/kbugbuster-desktops/es_AR.po b/translations/desktop_files/kbugbuster-desktops/es_AR.po new file mode 100644 index 00000000..84f1c183 --- /dev/null +++ b/translations/desktop_files/kbugbuster-desktops/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 17:25+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kbugbuster.desktop:2 +msgid "KBugBuster" +msgstr "" + +#. GenericName +#: kbugbuster.desktop:4 +msgid "TDE Bug Management" +msgstr "" + +#. Name +#: tderesources/bugzilla.desktop:2 +msgid "Bugzilla To-do List" +msgstr "" diff --git a/translations/desktop_files/kbugbuster-desktops/ka.po b/translations/desktop_files/kbugbuster-desktops/ka.po index ee3d9608..9c0232af 100644 --- a/translations/desktop_files/kbugbuster-desktops/ka.po +++ b/translations/desktop_files/kbugbuster-desktops/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-16 17:25+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 16:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/kbugbuster-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: kbugbuster.desktop:2 msgid "KBugBuster" -msgstr "" +msgstr "KBugBuster" #. GenericName #: kbugbuster.desktop:4 diff --git a/translations/desktop_files/kdeaccountsplugin.desktop/es_AR.po b/translations/desktop_files/kdeaccountsplugin.desktop/es_AR.po new file mode 100644 index 00000000..305df182 --- /dev/null +++ b/translations/desktop_files/kdeaccountsplugin.desktop/es_AR.po @@ -0,0 +1,20 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 17:28+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kdeaccountsplugin.desktop:2 +msgid "TDE Repository Accounts" +msgstr "" diff --git a/translations/desktop_files/kompare-desktops/es_AR.po b/translations/desktop_files/kompare-desktops/es_AR.po new file mode 100644 index 00000000..0ab30c85 --- /dev/null +++ b/translations/desktop_files/kompare-desktops/es_AR.po @@ -0,0 +1,40 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 17:38+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: kompare.desktop:2 +msgid "Kompare" +msgstr "" + +#. GenericName +#: kompare.desktop:4 +msgid "Diff/Patch Frontend" +msgstr "" + +#. Name +#: komparenavtreepart/komparenavtreepart.desktop:2 +msgid "KompareNavTreePart" +msgstr "" + +#. Name +#: komparepart/komparepart.desktop:2 +msgid "KomparePart" +msgstr "" + +#. Comment +#: komparepart/komparepart.desktop:4 +msgid "A part to graphically show the difference between 2 files" +msgstr "" diff --git a/translations/desktop_files/kompare-desktops/ka.po b/translations/desktop_files/kompare-desktops/ka.po new file mode 100644 index 00000000..ca20a8d3 --- /dev/null +++ b/translations/desktop_files/kompare-desktops/ka.po @@ -0,0 +1,43 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 17:38+0200\n" +"PO-Revision-Date: 2024-12-21 16:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/kompare-desktop-files/ka/>\n" +"Language: ka\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" + +#. Name +#: kompare.desktop:2 +msgid "Kompare" +msgstr "Kompare" + +#. GenericName +#: kompare.desktop:4 +msgid "Diff/Patch Frontend" +msgstr "Diff/Patch-ის წინáƒáƒ‘áƒáƒšáƒ" + +#. Name +#: komparenavtreepart/komparenavtreepart.desktop:2 +msgid "KompareNavTreePart" +msgstr "KompareNavTreePart" + +#. Name +#: komparepart/komparepart.desktop:2 +msgid "KomparePart" +msgstr "KomparePart" + +#. Comment +#: komparepart/komparepart.desktop:4 +msgid "A part to graphically show the difference between 2 files" +msgstr "ნáƒáƒ¬áƒ˜áƒšáƒ˜ 2 ფáƒáƒ˜áƒšáƒ˜áƒ¡ სხვáƒáƒáƒ‘ის გრáƒáƒ¤áƒ˜áƒ™áƒ£áƒšáƒáƒ“ სáƒáƒ©áƒ•áƒ”ნებლáƒáƒ“" diff --git a/translations/desktop_files/kuiviewer-desktops/es_AR.po b/translations/desktop_files/kuiviewer-desktops/es_AR.po new file mode 100644 index 00000000..30563e25 --- /dev/null +++ b/translations/desktop_files/kuiviewer-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 17:43+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: designerthumbnail.desktop:2 +msgid "Qt Designer Files" +msgstr "" + +#. Name +#: kuiviewer.desktop:2 +msgid "KUIViewer" +msgstr "" + +#. GenericName +#: kuiviewer.desktop:4 +msgid "TQt3 Designer UI File Viewer" +msgstr "" + +#. Name +#: kuiviewer_part.desktop:2 +msgid "KUIViewerPart" +msgstr "" diff --git a/translations/desktop_files/kuiviewer-desktops/ka.po b/translations/desktop_files/kuiviewer-desktops/ka.po index 1b1f43e3..71f14a11 100644 --- a/translations/desktop_files/kuiviewer-desktops/ka.po +++ b/translations/desktop_files/kuiviewer-desktops/ka.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-16 17:43+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 16:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/kuiviewer-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: designerthumbnail.desktop:2 @@ -24,7 +25,7 @@ msgstr "Qt დიზáƒáƒ˜áƒœáƒ”რის ფáƒáƒ˜áƒšáƒ”ბი" #. Name #: kuiviewer.desktop:2 msgid "KUIViewer" -msgstr "" +msgstr "KUIViewer" #. GenericName #: kuiviewer.desktop:4 @@ -34,4 +35,4 @@ msgstr "TQt3 დიზáƒáƒ˜áƒœáƒ”რის UI ფáƒáƒ˜áƒšáƒ—რმხილრ#. Name #: kuiviewer_part.desktop:2 msgid "KUIViewerPart" -msgstr "" +msgstr "KUIViewerPart" diff --git a/translations/desktop_files/scheck.themerc/es_AR.po b/translations/desktop_files/scheck.themerc/es_AR.po new file mode 100644 index 00000000..57123d49 --- /dev/null +++ b/translations/desktop_files/scheck.themerc/es_AR.po @@ -0,0 +1,25 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 17:47+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: scheck.themerc:2 +msgid "Scheck" +msgstr "" + +#. Comment +#: scheck.themerc:4 +msgid "Development style for searching accelerator and style guide conflicts" +msgstr "" diff --git a/translations/desktop_files/scheck.themerc/ka.po b/translations/desktop_files/scheck.themerc/ka.po index c52d6c97..4c6bb3e4 100644 --- a/translations/desktop_files/scheck.themerc/ka.po +++ b/translations/desktop_files/scheck.themerc/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-16 17:47+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 16:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/scheck-scheckthemerc/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: scheck.themerc:2 msgid "Scheck" -msgstr "" +msgstr "Scheck" #. Comment #: scheck.themerc:4 diff --git a/translations/desktop_files/tdecachegrind-desktops/es_AR.po b/translations/desktop_files/tdecachegrind-desktops/es_AR.po new file mode 100644 index 00000000..97dd19b0 --- /dev/null +++ b/translations/desktop_files/tdecachegrind-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 17:51+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: tdecachegrind.desktop:2 +msgid "TDECachegrind" +msgstr "" + +#. GenericName +#: tdecachegrind.desktop:4 +msgid "Profiler Frontend" +msgstr "" + +#. Comment +#: tdecachegrind.desktop:6 +msgid "Visualization of Performance Profiling Data" +msgstr "" + +#. Comment +#: x-tdecachegrind.desktop:2 +msgid "Cachegrind/Callgrind Profile Dump" +msgstr "" diff --git a/translations/desktop_files/tdecachegrind-desktops/ka.po b/translations/desktop_files/tdecachegrind-desktops/ka.po index a8403c56..e2c85ca7 100644 --- a/translations/desktop_files/tdecachegrind-desktops/ka.po +++ b/translations/desktop_files/tdecachegrind-desktops/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-16 17:51+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 16:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/tdecachegrind-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: tdecachegrind.desktop:2 msgid "TDECachegrind" -msgstr "" +msgstr "TDECachegrind" #. GenericName #: tdecachegrind.desktop:4 diff --git a/translations/desktop_files/tdefile-desktops/es_AR.po b/translations/desktop_files/tdefile-desktops/es_AR.po new file mode 100644 index 00000000..608cebd7 --- /dev/null +++ b/translations/desktop_files/tdefile-desktops/es_AR.po @@ -0,0 +1,35 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 18:03+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: c++/tdefile_cpp.desktop:2 +msgid "C++ Info" +msgstr "" + +#. Name +#: c++/tdefile_h.desktop:2 +msgid "C/C++ Header Info" +msgstr "" + +#. Name +#: diff/tdefile_diff.desktop:2 +msgid "Diff Stats" +msgstr "" + +#. Name +#: ts/tdefile_ts.desktop:2 +msgid "Qt Linguist File Info" +msgstr "" diff --git a/translations/desktop_files/tdefile-desktops/ka.po b/translations/desktop_files/tdefile-desktops/ka.po index 7b0e2e18..a53b7bf7 100644 --- a/translations/desktop_files/tdefile-desktops/ka.po +++ b/translations/desktop_files/tdefile-desktops/ka.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-16 18:03+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 16:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/tdefile-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: c++/tdefile_cpp.desktop:2 @@ -29,7 +30,7 @@ msgstr "C/C++ ზედრკáƒáƒšáƒáƒœáƒ¢áƒ˜áƒ¢áƒ£áƒšáƒ˜áƒ¡ ინფáƒáƒ á #. Name #: diff/tdefile_diff.desktop:2 msgid "Diff Stats" -msgstr "" +msgstr "სხვáƒáƒáƒ‘ის სტáƒáƒ¢áƒ˜áƒ¡áƒ¢áƒ˜áƒ™áƒ" #. Name #: ts/tdefile_ts.desktop:2 diff --git a/translations/desktop_files/tdeioslave-desktops/es_AR.po b/translations/desktop_files/tdeioslave-desktops/es_AR.po new file mode 100644 index 00000000..2bc646e4 --- /dev/null +++ b/translations/desktop_files/tdeioslave-desktops/es_AR.po @@ -0,0 +1,164 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2021-07-07 18:23+0000\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: svn/ksvnd/ksvnd.desktop:2 +msgid "KDED Subversion Module" +msgstr "" + +#. Comment +#: svn/ksvnd/ksvnd.desktop:4 +msgid "Provides tdeio subversion client services with TDESDK apps" +msgstr "" + +#. Name +#: svn/svnhelper/apply_patch.desktop:8 +msgid "Apply Patch..." +msgstr "" + +#. Comment +#: svn/svnhelper/apply_patch.desktop:9 +msgid "Apply the patch to another folder/file" +msgstr "" + +#. X-TDE-Submenu +#: svn/svnhelper/subversion.desktop:3 +msgid "Subversion" +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:10 +msgid "Add to Repository" +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:15 +msgid "Delete From Repository" +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:20 +msgid "Revert Local Changes" +msgstr "" + +#. Comment +#: svn/svnhelper/subversion.desktop:21 +msgid "Remove any changes made locally. Warning - this cannot be undone." +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:26 +msgid "Rename..." +msgstr "" + +#. Comment +#: svn/svnhelper/subversion.desktop:27 +msgid "" +"Rename a file locally and in the repository. Use this rather than adding " +"and deleting to rename a file." +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:32 +msgid "Import Repository" +msgstr "" + +#. Comment +#: svn/svnhelper/subversion.desktop:33 +msgid "" +"Put folder into an existing repository to put it under revision control." +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:38 +msgid "Checkout From Repository..." +msgstr "" + +#. Comment +#: svn/svnhelper/subversion.desktop:39 +msgid "Checkout out files from an existing repository into this folder." +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:44 +msgid "Switch..." +msgstr "" + +#. Comment +#: svn/svnhelper/subversion.desktop:45 +msgid "Switch given working copy to another branch" +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:50 +msgid "Merge..." +msgstr "" + +#. Comment +#: svn/svnhelper/subversion.desktop:51 +msgid "Merge changes between this and another branch" +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:56 +msgid "Blame..." +msgstr "" + +#. Comment +#: svn/svnhelper/subversion.desktop:57 +msgid "See who wrote each line of the file and in what revision" +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:62 +msgid "Create Patch..." +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:66 +msgid "Export..." +msgstr "" + +#. Comment +#: svn/svnhelper/subversion.desktop:67 +msgid "Checkout out an unversioned copy of a tree from a repository" +msgstr "" + +#. Name +#: svn/svnhelper/subversion.desktop:72 +msgid "Diff (local)" +msgstr "" + +#. Comment +#: svn/svnhelper/subversion.desktop:73 +msgid "Show local changes since last update" +msgstr "" + +#. Name +#: svn/svnhelper/subversion_toplevel.desktop:8 +msgid "SVN Update" +msgstr "" + +#. Name +#: svn/svnhelper/subversion_toplevel.desktop:13 +msgid "SVN Commit" +msgstr "" + +#. Description +#: svn/svn+file.protocol:2 svn/svn+http.protocol:2 svn/svn+https.protocol:2 +#: svn/svn+ssh.protocol:2 svn/svn.protocol:2 +msgid "Subversion ioslave" +msgstr "" diff --git a/translations/desktop_files/tdeioslave-desktops/ka.po b/translations/desktop_files/tdeioslave-desktops/ka.po index 4be23164..ecd10f2c 100644 --- a/translations/desktop_files/tdeioslave-desktops/ka.po +++ b/translations/desktop_files/tdeioslave-desktops/ka.po @@ -1,20 +1,21 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-07-07 18:23+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 16:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/tdeioslave-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: svn/ksvnd/ksvnd.desktop:2 @@ -25,6 +26,7 @@ msgstr "KDED Subversion მáƒáƒ“ული" #: svn/ksvnd/ksvnd.desktop:4 msgid "Provides tdeio subversion client services with TDESDK apps" msgstr "" +"მáƒáƒ’áƒáƒ¬áƒ•áƒ“ით tdeio subversion-ის კლიენტის სერვისებს TDESDK áƒáƒžáƒšáƒ˜áƒ™áƒáƒªáƒ˜áƒ”ბისთვის" #. Name #: svn/svnhelper/apply_patch.desktop:8 @@ -38,9 +40,8 @@ msgstr "ბებკის სხვრსáƒáƒ¥áƒáƒ¦áƒáƒšáƒ“ეზე/ფრ#. X-TDE-Submenu #: svn/svnhelper/subversion.desktop:3 -#, fuzzy msgid "Subversion" -msgstr "KDED Subversion მáƒáƒ“ული" +msgstr "Subversion" #. Name #: svn/svnhelper/subversion.desktop:10 @@ -167,6 +168,5 @@ msgstr "SVN შესრულებáƒ" #. Description #: svn/svn+file.protocol:2 svn/svn+http.protocol:2 svn/svn+https.protocol:2 #: svn/svn+ssh.protocol:2 svn/svn.protocol:2 -#, fuzzy msgid "Subversion ioslave" -msgstr "KDED Subversion მáƒáƒ“ული" +msgstr "Subversion ioslave" diff --git a/translations/desktop_files/umbrello-desktops/es_AR.po b/translations/desktop_files/umbrello-desktops/es_AR.po new file mode 100644 index 00000000..18207d8c --- /dev/null +++ b/translations/desktop_files/umbrello-desktops/es_AR.po @@ -0,0 +1,30 @@ +# SOME DESCRIPTIVE TITLE. +# This file is put in the public domain. +# Slávek Banko <slavek.banko@axis.cz>, 2025. +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2020-07-16 18:15+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: es_AR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Name +#: umbrello.desktop:2 +msgid "Umbrello" +msgstr "" + +#. GenericName +#: umbrello.desktop:4 +msgid "UML Modeller" +msgstr "" + +#. Comment +#: x-umbrello.desktop:2 +msgid "Umbrello UML Modeller File" +msgstr "" diff --git a/translations/desktop_files/umbrello-desktops/ka.po b/translations/desktop_files/umbrello-desktops/ka.po index de85ceb9..243bacae 100644 --- a/translations/desktop_files/umbrello-desktops/ka.po +++ b/translations/desktop_files/umbrello-desktops/ka.po @@ -1,25 +1,26 @@ # SOME DESCRIPTIVE TITLE. # This file is put in the public domain. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Temuri Doghonadze <rkavt@smartprojects.ge>, 2024. msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-07-16 18:15+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" -"Language-Team: LANGUAGE <LL@li.org>\n" +"PO-Revision-Date: 2024-12-21 16:11+0000\n" +"Last-Translator: Temuri Doghonadze <rkavt@smartprojects.ge>\n" +"Language-Team: Georgian <https://mirror.git.trinitydesktop.org/weblate/" +"projects/tdesdk/umbrello-desktop-files/ka/>\n" "Language: ka\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Weblate 4.17\n" #. Name #: umbrello.desktop:2 msgid "Umbrello" -msgstr "" +msgstr "Umbrello" #. GenericName #: umbrello.desktop:4 diff --git a/umbrello/umbrello/aligntoolbar.cpp b/umbrello/umbrello/aligntoolbar.cpp index 756283d4..c244df58 100644 --- a/umbrello/umbrello/aligntoolbar.cpp +++ b/umbrello/umbrello/aligntoolbar.cpp @@ -22,7 +22,7 @@ // kde includes #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // app includes #include "uml.h" @@ -50,7 +50,7 @@ AlignToolBar::AlignToolBar(TQMainWindow* parentWindow, const char* ) setVerticalStretchable( true ); // gets called whenever a button in the toolbar is clicked - connect( this, TQT_SIGNAL( released( int ) ), this, TQT_SLOT( slotButtonChanged (int ) ) ); + connect( this, TQ_SIGNAL( released( int ) ), this, TQ_SLOT( slotButtonChanged (int ) ) ); } AlignToolBar::~AlignToolBar() { diff --git a/umbrello/umbrello/associationwidget.cpp b/umbrello/umbrello/associationwidget.cpp index aa0e1683..49d61037 100644 --- a/umbrello/umbrello/associationwidget.cpp +++ b/umbrello/umbrello/associationwidget.cpp @@ -819,7 +819,7 @@ void AssociationWidget::setUMLAssociation (UMLAssociation * assoc) assoc->nrof_parent_widgets = 0; assoc->nrof_parent_widgets++; - connect(assoc, TQT_SIGNAL(modified()), this, TQT_SLOT(syncToModel())); + connect(assoc, TQ_SIGNAL(modified()), this, TQ_SLOT(syncToModel())); } } @@ -2248,12 +2248,12 @@ void AssociationWidget::mouseReleaseEvent(TQMouseEvent * me) { } m_pMenu = new ListPopupMenu(m_pView, menuType); m_pMenu->popup(me -> globalPos()); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); setSelected(); }//end method mouseReleaseEvent bool AssociationWidget::showDialog() { - AssocPropDlg dlg(static_cast<TQWidget*>(m_pView), this ); + AssocPropDlg dlg(m_pView, this ); if (! dlg.exec()) return false; TQString name = getName(); @@ -2990,7 +2990,7 @@ void AssociationWidget::setSelected(bool _select /* = true */) { m_role[A].m_pChangeWidget-> setSelected( _select ); if( m_role[B].m_pChangeWidget) m_role[B].m_pChangeWidget-> setSelected( _select ); - kapp->processEvents(); + tdeApp->processEvents(); //Update the docwindow for this association. // This is done last because each of the above setSelected calls // overwrites the docwindow, but we want the main association doc @@ -3000,7 +3000,7 @@ void AssociationWidget::setSelected(bool _select /* = true */) { m_pView -> showDocumentation( this, false ); } else m_pView -> updateDocumentation( true ); - kapp->processEvents(); + tdeApp->processEvents(); m_LinePath.setSelected( _select ); if (! _select) { // For now, if _select is true we don't make the assoc class line @@ -3032,7 +3032,7 @@ bool AssociationWidget::onAssociation(const TQPoint & point) { void AssociationWidget::slotRemovePopupMenu() { if(m_pMenu) { - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } @@ -3122,15 +3122,15 @@ void AssociationWidget::setUMLObject(UMLObject *obj) { break; case Uml::ot_Attribute: klass = static_cast<UMLClassifier*>(obj->parent()); - connect(klass, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); + connect(klass, TQ_SIGNAL(attributeRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); attr = static_cast<UMLAttribute*>(obj); - connect(attr, TQT_SIGNAL(attributeChanged()), this, TQT_SLOT(slotAttributeChanged())); + connect(attr, TQ_SIGNAL(attributeChanged()), this, TQ_SLOT(slotAttributeChanged())); break; case Uml::ot_EntityAttribute: ent = static_cast<UMLEntity*>(obj->parent()); - connect(ent, TQT_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); + connect(ent, TQ_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(slotAttributeRemoved(UMLClassifierListItem*))); break; default: kError() << "UMLAssociation constructor: cannot associate UMLObject of type " @@ -3200,8 +3200,8 @@ void AssociationWidget::init (UMLView *view) m_umldoc = UMLApp::app()->getDocument(); m_LinePath.setAssociation( this ); - connect(m_pView, TQT_SIGNAL(sigRemovePopupMenu()), this, TQT_SLOT(slotRemovePopupMenu())); - connect(m_pView, TQT_SIGNAL( sigClearAllSelected() ), this, TQT_SLOT( slotClearAllSelected() ) ); + connect(m_pView, TQ_SIGNAL(sigRemovePopupMenu()), this, TQ_SLOT(slotRemovePopupMenu())); + connect(m_pView, TQ_SIGNAL( sigClearAllSelected() ), this, TQ_SLOT( slotClearAllSelected() ) ); } void AssociationWidget::resetTextPositions() { @@ -3250,10 +3250,10 @@ UMLOperation *AssociationWidget::getOperation() { void AssociationWidget::setOperation(UMLOperation *op) { if (m_pObject) - disconnect(m_pObject, TQT_SIGNAL(modified()), m_pName, TQT_SLOT(setMessageText())); + disconnect(m_pObject, TQ_SIGNAL(modified()), m_pName, TQ_SLOT(setMessageText())); m_pObject = op; if (m_pObject) - connect(m_pObject, TQT_SIGNAL(modified()), m_pName, TQT_SLOT(setMessageText())); + connect(m_pObject, TQ_SIGNAL(modified()), m_pName, TQ_SLOT(setMessageText())); } UMLClassifier *AssociationWidget::getOperationOwner() { diff --git a/umbrello/umbrello/autolayout/autolayoutdlg.cpp b/umbrello/umbrello/autolayout/autolayoutdlg.cpp index 9cb96f18..4cd39810 100644 --- a/umbrello/umbrello/autolayout/autolayoutdlg.cpp +++ b/umbrello/umbrello/autolayout/autolayoutdlg.cpp @@ -140,7 +140,7 @@ void AutolayoutDlg::readConfig( TDEConfig * conf) void AutolayoutDlg::writeConfig( TDEConfig * conf) { - // conf=kapp->config(); + // conf=tdeApp->config(); conf->setGroup("AutolayoutDlg"); conf->writeEntry( "associationAsEdges",associationEdgesCB->isChecked()); conf->writeEntry( "centerDiagram", centerDiagramCB->isChecked()); diff --git a/umbrello/umbrello/autolayout/newautolayoutdialog.ui b/umbrello/umbrello/autolayout/newautolayoutdialog.ui index 6255904c..fcde379b 100644 --- a/umbrello/umbrello/autolayout/newautolayoutdialog.ui +++ b/umbrello/umbrello/autolayout/newautolayoutdialog.ui @@ -528,7 +528,7 @@ <slot>slotSelectAlgorithm(const TQString&)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>slotDoAutolayout()</slot> <slot>slotSaveSettings()</slot> <slot>slotReloadSettings()</slot> @@ -543,6 +543,6 @@ <slot>slotSetCenterDiagram(bool b)</slot> <slot>slotSetShapeSeparation(int i)</slot> <slot specifier="pure virtual">slotSelectAlgorithm(const TQString&)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/classifier.cpp b/umbrello/umbrello/classifier.cpp index 7aa94806..ae18fec1 100644 --- a/umbrello/umbrello/classifier.cpp +++ b/umbrello/umbrello/classifier.cpp @@ -244,7 +244,7 @@ bool UMLClassifier::addOperation(UMLOperation* op, int position ) m_List.append( op ); emit operationAdded(op); UMLObject::emitModified(); - connect(op,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(op,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } @@ -270,7 +270,7 @@ int UMLClassifier::removeOperation(UMLOperation *op) { } // disconnection needed. // note that we don't delete the operation, just remove it from the Classifier - disconnect(op,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + disconnect(op,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); emit operationRemoved(op); UMLObject::emitModified(); return m_List.count(); @@ -550,7 +550,7 @@ UMLAttribute* UMLClassifier::addAttribute(const TQString &name, Uml::IDType id / m_List.append(a); emit attributeAdded(a); UMLObject::emitModified(); - connect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return a; } @@ -564,7 +564,7 @@ UMLAttribute* UMLClassifier::addAttribute(const TQString &name, UMLObject *type, m_List.append(a); emit attributeAdded(a); UMLObject::emitModified(); - connect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return a; } @@ -579,7 +579,7 @@ bool UMLClassifier::addAttribute(UMLAttribute* att, IDChangeLog* Log /* = 0 */, m_List.append(att); emit attributeAdded(att); UMLObject::emitModified(); - connect(att, TQT_SIGNAL(modified()), this, TQT_SIGNAL(modified())); + connect(att, TQ_SIGNAL(modified()), this, TQ_SIGNAL(modified())); return true; } else if (Log) { Log->removeChangeByNewID(att->getID()); @@ -597,7 +597,7 @@ int UMLClassifier::removeAttribute(UMLAttribute* a) { UMLObject::emitModified(); // If we are deleting the object, then we don't need to disconnect..this is done auto-magically // for us by TQObject. -b.t. - // disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + // disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); delete a; return m_List.count(); } @@ -677,7 +677,7 @@ UMLTemplate* UMLClassifier::addTemplate(const TQString &name, Uml::IDType id) { m_List.append(t); emit templateAdded(t); UMLObject::emitModified(); - connect(t, TQT_SIGNAL(modified()), this, TQT_SIGNAL(modified())); + connect(t, TQ_SIGNAL(modified()), this, TQ_SIGNAL(modified())); return t; } @@ -689,7 +689,7 @@ bool UMLClassifier::addTemplate(UMLTemplate* newTemplate, IDChangeLog* log /* = m_List.append(newTemplate); emit templateAdded(newTemplate); UMLObject::emitModified(); - connect(newTemplate,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(newTemplate,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } else if (log) { log->removeChangeByNewID( newTemplate->getID() ); @@ -710,7 +710,7 @@ bool UMLClassifier::addTemplate(UMLTemplate* Template, int position) m_List.append(Template); emit templateAdded(Template); UMLObject::emitModified(); - connect(Template,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(Template,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } //else @@ -724,7 +724,7 @@ int UMLClassifier::removeTemplate(UMLTemplate* umltemplate) { } emit templateRemoved(umltemplate); UMLObject::emitModified(); - disconnect(umltemplate,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + disconnect(umltemplate,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return m_List.count(); } diff --git a/umbrello/umbrello/classifiercodedocument.cpp b/umbrello/umbrello/classifiercodedocument.cpp index 29e4bd88..e6691f82 100644 --- a/umbrello/umbrello/classifiercodedocument.cpp +++ b/umbrello/umbrello/classifiercodedocument.cpp @@ -397,15 +397,15 @@ void ClassifierCodeDocument::init (UMLClassifier * c ) // slots if (parentIsClass()) { - connect(c,TQT_SIGNAL(attributeAdded(UMLClassifierListItem*)),this,TQT_SLOT(addAttributeClassField(UMLClassifierListItem*))); - connect(c,TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)),this,TQT_SLOT(removeAttributeClassField(UMLClassifierListItem*))); + connect(c,TQ_SIGNAL(attributeAdded(UMLClassifierListItem*)),this,TQ_SLOT(addAttributeClassField(UMLClassifierListItem*))); + connect(c,TQ_SIGNAL(attributeRemoved(UMLClassifierListItem*)),this,TQ_SLOT(removeAttributeClassField(UMLClassifierListItem*))); } - connect(c,TQT_SIGNAL(sigAssociationEndAdded(UMLAssociation*)),this,TQT_SLOT(addAssociationClassField(UMLAssociation*))); - connect(c,TQT_SIGNAL(sigAssociationEndRemoved(UMLAssociation*)),this,TQT_SLOT(removeAssociationClassField(UMLAssociation*))); - connect(c,TQT_SIGNAL(operationAdded(UMLClassifierListItem*)),this,TQT_SLOT(addOperation(UMLClassifierListItem*))); - connect(c,TQT_SIGNAL(operationRemoved(UMLClassifierListItem*)),this,TQT_SLOT(removeOperation(UMLClassifierListItem*))); - connect(c,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + connect(c,TQ_SIGNAL(sigAssociationEndAdded(UMLAssociation*)),this,TQ_SLOT(addAssociationClassField(UMLAssociation*))); + connect(c,TQ_SIGNAL(sigAssociationEndRemoved(UMLAssociation*)),this,TQ_SLOT(removeAssociationClassField(UMLAssociation*))); + connect(c,TQ_SIGNAL(operationAdded(UMLClassifierListItem*)),this,TQ_SLOT(addOperation(UMLClassifierListItem*))); + connect(c,TQ_SIGNAL(operationRemoved(UMLClassifierListItem*)),this,TQ_SLOT(removeOperation(UMLClassifierListItem*))); + connect(c,TQ_SIGNAL(modified()),this,TQ_SLOT(syncToParent())); } diff --git a/umbrello/umbrello/cmdlineexportallviewsevent.cpp b/umbrello/umbrello/cmdlineexportallviewsevent.cpp index 60cbee23..fc2cf5b4 100644 --- a/umbrello/umbrello/cmdlineexportallviewsevent.cpp +++ b/umbrello/umbrello/cmdlineexportallviewsevent.cpp @@ -44,5 +44,5 @@ void CmdLineExportAllViewsEvent::exportAllViews() { } } - kapp->sendEvent(UMLApp::app(), new TQCloseEvent()); + tdeApp->sendEvent(UMLApp::app(), new TQCloseEvent()); } diff --git a/umbrello/umbrello/codeaccessormethod.cpp b/umbrello/umbrello/codeaccessormethod.cpp index e7890865..435e575f 100644 --- a/umbrello/umbrello/codeaccessormethod.cpp +++ b/umbrello/umbrello/codeaccessormethod.cpp @@ -189,7 +189,7 @@ void CodeAccessorMethod::initFields(CodeClassField * parentClassField ) { m_accessorType = GET; m_canDelete = false; // we cant delete these with the codeeditor, delete the UML operation instead. - connect(m_parentclassfield,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + connect(m_parentclassfield,TQ_SIGNAL(modified()),this,TQ_SLOT(syncToParent())); } #include "codeaccessormethod.moc" diff --git a/umbrello/umbrello/codeclassfield.cpp b/umbrello/umbrello/codeclassfield.cpp index 60e97c77..e32efed0 100644 --- a/umbrello/umbrello/codeclassfield.cpp +++ b/umbrello/umbrello/codeclassfield.cpp @@ -610,7 +610,7 @@ void CodeClassField::finishInitialization() { initAccessorMethods(); updateContent(); - connect(getParentObject(),TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); // child objects will trigger off this signal + connect(getParentObject(),TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); // child objects will trigger off this signal } diff --git a/umbrello/umbrello/codeclassfielddeclarationblock.cpp b/umbrello/umbrello/codeclassfielddeclarationblock.cpp index ba7c6878..b7a00091 100644 --- a/umbrello/umbrello/codeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codeclassfielddeclarationblock.cpp @@ -168,7 +168,7 @@ void CodeClassFieldDeclarationBlock::init (CodeClassField * parentCF) { m_parentclassfield = parentCF; m_canDelete = false; - connect(m_parentclassfield,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + connect(m_parentclassfield,TQ_SIGNAL(modified()),this,TQ_SLOT(syncToParent())); } #include "codeclassfielddeclarationblock.moc" diff --git a/umbrello/umbrello/codegenerationpolicy.cpp b/umbrello/umbrello/codegenerationpolicy.cpp index 0b33372a..6de00068 100644 --- a/umbrello/umbrello/codegenerationpolicy.cpp +++ b/umbrello/umbrello/codegenerationpolicy.cpp @@ -30,7 +30,7 @@ #include <tdeconfig.h> #include <tdeversion.h> #include <kdebug.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> // app includes #include "uml.h" diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp index ea9bea43..f4734dc0 100644 --- a/umbrello/umbrello/codegenerator.cpp +++ b/umbrello/umbrello/codegenerator.cpp @@ -398,7 +398,7 @@ TQString CodeGenerator::overwritableName(const TQString& name, const TQString &e int suffix; OverwriteDialogue overwriteDialog( name, outputDirectory.absPath(), - m_applyToAllRemaining, kapp -> mainWidget() ); + m_applyToAllRemaining, tdeApp -> mainWidget() ); switch (pol->getOverwritePolicy()) { //if it exists, check the OverwritePolicy we should use case CodeGenerationPolicy::Ok: //ok to overwrite file filename = name + extension; @@ -669,13 +669,13 @@ void CodeGenerator::initFields() { void CodeGenerator::connect_newcodegen_slots() { UMLDoc *doc = UMLApp::app()->getDocument(); - connect(doc, TQT_SIGNAL(sigObjectCreated(UMLObject*)), - this, TQT_SLOT(checkAddUMLObject(UMLObject*))); - connect(doc, TQT_SIGNAL(sigObjectRemoved(UMLObject*)), - this, TQT_SLOT(checkRemoveUMLObject(UMLObject*))); + connect(doc, TQ_SIGNAL(sigObjectCreated(UMLObject*)), + this, TQ_SLOT(checkAddUMLObject(UMLObject*))); + connect(doc, TQ_SIGNAL(sigObjectRemoved(UMLObject*)), + this, TQ_SLOT(checkRemoveUMLObject(UMLObject*))); CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy(); - connect(commonPolicy, TQT_SIGNAL(modifiedCodeContent()), - this, TQT_SLOT(syncCodeToDocument())); + connect(commonPolicy, TQ_SIGNAL(modifiedCodeContent()), + this, TQ_SLOT(syncCodeToDocument())); } // these are utility methods for accessing the default diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp index 3a251802..0fbd3bb9 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerationform.cpp @@ -58,8 +58,8 @@ CPPCodeGenerationForm::CPPCodeGenerationForm( TQWidget *parent, const char *name TQCheckListItem::CheckBox ); connect(GeneralOptionsListView, - TQT_SIGNAL(clicked(TQListViewItem *)), this, - TQT_SLOT(generalOptionsListViewClicked(TQListViewItem *)) + TQ_SIGNAL(clicked(TQListViewItem *)), this, + TQ_SLOT(generalOptionsListViewClicked(TQListViewItem *)) ); } diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui index 86af506a..81590f46 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui @@ -470,9 +470,9 @@ <slot>browseClicked()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>browseClicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">kcombobox.h</include> diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp index f403c166..ff115735 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp @@ -156,7 +156,7 @@ TQString SimpleCodeGenerator::overwritableName(UMLPackage* concept, const TQStri int suffix; OverwriteDialogue overwriteDialogue( filename, outputDir.absPath(), - m_applyToAllRemaining, kapp -> mainWidget() ); + m_applyToAllRemaining, tdeApp -> mainWidget() ); switch(commonPolicy->getOverwritePolicy()) { //if it exists, check the OverwritePolicy we should use case CodeGenerationPolicy::Ok: //ok to overwrite file break; diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp index c10e6da6..dd8c9ba8 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.cpp @@ -211,13 +211,13 @@ void NameAST::setGlobal( bool b ) void NameAST::setUnqualifiedName( ClassOrNamespaceNameAST::Node& unqualifiedName ) { - m_unqualifiedName = unqualifiedName; - if( m_unqualifiedName.get() ) m_unqualifiedName->setParent( this ); + m_unqualifiedName = std::move(unqualifiedName); + if( m_unqualifiedName ) m_unqualifiedName->setParent( this ); } void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNamespaceName ) { - if( !classOrNamespaceName.get() ) + if( !classOrNamespaceName ) return; classOrNamespaceName->setParent( this ); @@ -226,7 +226,7 @@ void NameAST::addClassOrNamespaceName( ClassOrNamespaceNameAST::Node& classOrNam TQString NameAST::text() const { - if( !m_unqualifiedName.get() ) + if( !m_unqualifiedName ) return TQString(); TQString str; @@ -241,7 +241,7 @@ TQString NameAST::text() const ++it; } - if( m_unqualifiedName.get() ) + if( m_unqualifiedName ) str += m_unqualifiedName->text(); return str; @@ -260,7 +260,7 @@ LinkageBodyAST::LinkageBodyAST() void LinkageBodyAST::addDeclaration( DeclarationAST::Node& ast ) { - if( !ast.get() ) + if( !ast ) return; ast->setParent( this ); @@ -274,20 +274,20 @@ LinkageSpecificationAST::LinkageSpecificationAST() void LinkageSpecificationAST::setExternType( AST::Node& externType ) { - m_externType = externType; - if( m_externType.get() ) m_externType->setParent( this ); + m_externType = std::move(externType); + if( m_externType ) m_externType->setParent( this ); } void LinkageSpecificationAST::setLinkageBody( LinkageBodyAST::Node& linkageBody ) { - m_linkageBody = linkageBody; - if( m_linkageBody.get() ) m_linkageBody->setParent( this ); + m_linkageBody = std::move(linkageBody); + if( m_linkageBody ) m_linkageBody->setParent( this ); } void LinkageSpecificationAST::setDeclaration( DeclarationAST::Node& decl ) { - m_declaration = decl; - if( m_declaration.get() ) m_declaration->setParent( this ); + m_declaration = std::move(decl); + if( m_declaration ) m_declaration->setParent( this ); } // ------------------------------------------------------------------------ @@ -299,7 +299,7 @@ TranslationUnitAST::TranslationUnitAST() void TranslationUnitAST::addDeclaration( DeclarationAST::Node& ast ) { - if( !ast.get() ) + if( !ast ) return; ast->setParent( this ); @@ -313,14 +313,14 @@ NamespaceAST::NamespaceAST() void NamespaceAST::setNamespaceName( AST::Node& namespaceName ) { - m_namespaceName = namespaceName; - if( m_namespaceName.get() ) m_namespaceName->setParent( this ); + m_namespaceName = std::move(namespaceName); + if( m_namespaceName ) m_namespaceName->setParent( this ); } void NamespaceAST::setLinkageBody( LinkageBodyAST::Node& linkageBody ) { - m_linkageBody = linkageBody; - if( m_linkageBody.get() ) m_linkageBody->setParent( this ); + m_linkageBody = std::move(linkageBody); + if( m_linkageBody ) m_linkageBody->setParent( this ); } @@ -331,14 +331,14 @@ NamespaceAliasAST::NamespaceAliasAST() void NamespaceAliasAST::setNamespaceName( AST::Node& namespaceName ) { - m_namespaceName = namespaceName; - if( m_namespaceName.get() ) m_namespaceName->setParent( this ); + m_namespaceName = std::move(namespaceName); + if( m_namespaceName ) m_namespaceName->setParent( this ); } void NamespaceAliasAST::setAliasName( NameAST::Node& name ) { - m_aliasName = name; - if( m_aliasName.get() ) m_aliasName->setParent( this ); + m_aliasName = std::move(name); + if( m_aliasName ) m_aliasName->setParent( this ); } // ------------------------------------------------------------------------ @@ -348,14 +348,14 @@ UsingAST::UsingAST() void UsingAST::setTypeName( AST::Node& typeName ) { - m_typeName = typeName; - if( m_typeName.get() ) m_typeName->setParent( this ); + m_typeName = std::move(typeName); + if( m_typeName ) m_typeName->setParent( this ); } void UsingAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } // ------------------------------------------------------------------------ @@ -365,8 +365,8 @@ UsingDirectiveAST::UsingDirectiveAST() void UsingDirectiveAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } TypedefAST::TypedefAST() @@ -375,20 +375,20 @@ TypedefAST::TypedefAST() void TypeSpecifierAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } void TypedefAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void TypedefAST::setInitDeclaratorList( InitDeclaratorListAST::Node& initDeclaratorList ) { - m_initDeclaratorList = initDeclaratorList; - if( m_initDeclaratorList.get() ) m_initDeclaratorList->setParent( this ); + m_initDeclaratorList = std::move(initDeclaratorList); + if( m_initDeclaratorList ) m_initDeclaratorList->setParent( this ); } // ------------------------------------------------------------------------ @@ -399,7 +399,7 @@ TemplateArgumentListAST::TemplateArgumentListAST() void TemplateArgumentListAST::addArgument( AST::Node& arg ) { - if( !arg.get() ) + if( !arg ) return; arg->setParent( this ); @@ -426,20 +426,20 @@ TemplateDeclarationAST::TemplateDeclarationAST() void TemplateDeclarationAST::setExported( AST::Node& exported ) { - m_exported = exported; - if( m_exported.get() ) m_exported->setParent( this ); + m_exported = std::move(exported); + if( m_exported ) m_exported->setParent( this ); } void TemplateDeclarationAST::setTemplateParameterList( TemplateParameterListAST::Node& templateParameterList ) { - m_templateParameterList = templateParameterList; - if( m_templateParameterList.get() ) m_templateParameterList->setParent( this ); + m_templateParameterList = std::move(templateParameterList); + if( m_templateParameterList ) m_templateParameterList->setParent( this ); } void TemplateDeclarationAST::setDeclaration( DeclarationAST::Node& declaration ) { - m_declaration = declaration; - if( m_declaration.get() ) m_declaration->setParent( this ); + m_declaration = std::move(declaration); + if( m_declaration ) m_declaration->setParent( this ); } // ------------------------------------------------------------------------ @@ -449,23 +449,23 @@ ClassOrNamespaceNameAST::ClassOrNamespaceNameAST() void ClassOrNamespaceNameAST::setName( AST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } void ClassOrNamespaceNameAST::setTemplateArgumentList( TemplateArgumentListAST::Node& templateArgumentList ) { - m_templateArgumentList = templateArgumentList; - if( m_templateArgumentList.get() ) m_templateArgumentList->setParent( this ); + m_templateArgumentList = std::move(templateArgumentList); + if( m_templateArgumentList ) m_templateArgumentList->setParent( this ); } TQString ClassOrNamespaceNameAST::text() const { - if( !m_name.get() ) + if( !m_name ) return TQString(); TQString str = m_name->text(); - if( m_templateArgumentList.get() ) + if( m_templateArgumentList ) str += TQString::fromLatin1("< ") + m_templateArgumentList->text() + TQString::fromLatin1(" >"); return str; @@ -478,27 +478,27 @@ TypeSpecifierAST::TypeSpecifierAST() void TypeSpecifierAST::setCvQualify( GroupAST::Node& cvQualify ) { - m_cvQualify = cvQualify; - if( m_cvQualify.get() ) m_cvQualify->setParent( this ); + m_cvQualify = std::move(cvQualify); + if( m_cvQualify ) m_cvQualify->setParent( this ); } void TypeSpecifierAST::setCv2Qualify( GroupAST::Node& cv2Qualify ) { - m_cv2Qualify = cv2Qualify; - if( m_cv2Qualify.get() ) m_cv2Qualify->setParent( this ); + m_cv2Qualify = std::move(cv2Qualify); + if( m_cv2Qualify ) m_cv2Qualify->setParent( this ); } TQString TypeSpecifierAST::text() const { TQString str; - if( m_cvQualify.get() ) + if( m_cvQualify ) str += m_cvQualify->text() + ' '; - if( m_name.get() ) + if( m_name ) str += m_name->text(); - if( m_cv2Qualify.get() ) + if( m_cv2Qualify ) str += TQString(" ") + m_cv2Qualify->text(); return str; @@ -512,13 +512,13 @@ ClassSpecifierAST::ClassSpecifierAST() void ClassSpecifierAST::setClassKey( AST::Node& classKey ) { - m_classKey = classKey; - if( m_classKey.get() ) m_classKey->setParent( this ); + m_classKey = std::move(classKey); + if( m_classKey ) m_classKey->setParent( this ); } void ClassSpecifierAST::addDeclaration( DeclarationAST::Node& declaration ) { - if( !declaration.get() ) + if( !declaration ) return; declaration->setParent( this ); @@ -527,8 +527,8 @@ void ClassSpecifierAST::addDeclaration( DeclarationAST::Node& declaration ) void ClassSpecifierAST::setBaseClause( BaseClauseAST::Node& baseClause ) { - m_baseClause = baseClause; - if( m_baseClause.get() ) m_baseClause->setParent( this ); + m_baseClause = std::move(baseClause); + if( m_baseClause ) m_baseClause->setParent( this ); } // ------------------------------------------------------------------------ @@ -539,7 +539,7 @@ EnumSpecifierAST::EnumSpecifierAST() void EnumSpecifierAST::addEnumerator( EnumeratorAST::Node& enumerator ) { - if( !enumerator.get() ) + if( !enumerator ) return; enumerator->setParent( this ); @@ -554,13 +554,13 @@ ElaboratedTypeSpecifierAST::ElaboratedTypeSpecifierAST() void ElaboratedTypeSpecifierAST::setKind( AST::Node& kind ) { - m_kind = kind; - if( m_kind.get() ) m_kind->setParent( this ); + m_kind = std::move(kind); + if( m_kind ) m_kind->setParent( this ); } TQString ElaboratedTypeSpecifierAST::text() const { - if( m_kind.get() ) + if( m_kind ) return m_kind->text() + ' ' + TypeSpecifierAST::text(); return TypeSpecifierAST::text(); @@ -578,14 +578,14 @@ EnumeratorAST::EnumeratorAST() void EnumeratorAST::setId( AST::Node& id ) { - m_id = id; - if( m_id.get() ) m_id->setParent( this ); + m_id = std::move(id); + if( m_id ) m_id->setParent( this ); } void EnumeratorAST::setExpr( AST::Node& expr ) { - m_expr = expr; - if( m_expr.get() ) m_expr->setParent( this ); + m_expr = std::move(expr); + if( m_expr ) m_expr->setParent( this ); } // ------------------------------------------------------------------------ @@ -596,7 +596,7 @@ BaseClauseAST::BaseClauseAST() void BaseClauseAST::addBaseSpecifier( BaseSpecifierAST::Node& baseSpecifier ) { - if( !baseSpecifier.get() ) + if( !baseSpecifier ) return; baseSpecifier->setParent( this ); @@ -610,20 +610,20 @@ BaseSpecifierAST::BaseSpecifierAST() void BaseSpecifierAST::setIsVirtual( AST::Node& isVirtual ) { - m_isVirtual = isVirtual; - if( m_isVirtual.get() ) m_isVirtual->setParent( this ); + m_isVirtual = std::move(isVirtual); + if( m_isVirtual ) m_isVirtual->setParent( this ); } void BaseSpecifierAST::setAccess( AST::Node& access ) { - m_access = access; - if( m_access.get() ) m_access->setParent( this ); + m_access = std::move(access); + if( m_access ) m_access->setParent( this ); } void BaseSpecifierAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } // ------------------------------------------------------------------------ @@ -633,32 +633,32 @@ SimpleDeclarationAST::SimpleDeclarationAST() void SimpleDeclarationAST::setFunctionSpecifier( GroupAST::Node& functionSpecifier ) { - m_functionSpecifier = functionSpecifier; - if( m_functionSpecifier.get() ) m_functionSpecifier->setParent( this ); + m_functionSpecifier = std::move(functionSpecifier); + if( m_functionSpecifier ) m_functionSpecifier->setParent( this ); } void SimpleDeclarationAST::setStorageSpecifier( GroupAST::Node& storageSpecifier ) { - m_storageSpecifier = storageSpecifier; - if( m_storageSpecifier.get() ) m_storageSpecifier->setParent( this ); + m_storageSpecifier = std::move(storageSpecifier); + if( m_storageSpecifier ) m_storageSpecifier->setParent( this ); } void SimpleDeclarationAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void SimpleDeclarationAST::setInitDeclaratorList( InitDeclaratorListAST::Node& initDeclaratorList ) { - m_initDeclaratorList = initDeclaratorList; - if( m_initDeclaratorList.get() ) m_initDeclaratorList->setParent( this ); + m_initDeclaratorList = std::move(initDeclaratorList); + if( m_initDeclaratorList ) m_initDeclaratorList->setParent( this ); } void SimpleDeclarationAST::setWinDeclSpec( GroupAST::Node& winDeclSpec ) { - m_winDeclSpec = winDeclSpec; - if( m_winDeclSpec.get() ) m_winDeclSpec->setParent( this ); + m_winDeclSpec = std::move(winDeclSpec); + if( m_winDeclSpec ) m_winDeclSpec->setParent( this ); } @@ -670,7 +670,7 @@ InitDeclaratorListAST::InitDeclaratorListAST() void InitDeclaratorListAST::addInitDeclarator( InitDeclaratorAST::Node& decl ) { - if( !decl.get() ) + if( !decl ) return; decl->setParent( this ); @@ -686,52 +686,52 @@ DeclaratorAST::DeclaratorAST() void DeclaratorAST::setSubDeclarator( DeclaratorAST::Node& subDeclarator ) { - m_subDeclarator = subDeclarator; - if( m_subDeclarator.get() ) m_subDeclarator->setParent( this ); + m_subDeclarator = std::move(subDeclarator); + if( m_subDeclarator ) m_subDeclarator->setParent( this ); } void DeclaratorAST::setDeclaratorId( NameAST::Node& declaratorId ) { - m_declaratorId = declaratorId; - if( m_declaratorId.get() ) m_declaratorId->setParent( this ); + m_declaratorId = std::move(declaratorId); + if( m_declaratorId ) m_declaratorId->setParent( this ); } void DeclaratorAST::setBitfieldInitialization( AST::Node& bitfieldInitialization ) { - m_bitfieldInitialization = bitfieldInitialization; - if( m_bitfieldInitialization.get() ) m_bitfieldInitialization->setParent( this ); + m_bitfieldInitialization = std::move(bitfieldInitialization); + if( m_bitfieldInitialization ) m_bitfieldInitialization->setParent( this ); } void DeclaratorAST::addArrayDimension( AST::Node& arrayDimension ) { - if( !arrayDimension.get() ) + if( !arrayDimension ) return; arrayDimension->setParent( this ); m_arrayDimensionList.append( arrayDimension.release() ); } -void DeclaratorAST::setParameterDeclarationClause( std::auto_ptr<class ParameterDeclarationClauseAST>& parameterDeclarationClause ) +void DeclaratorAST::setParameterDeclarationClause( std::unique_ptr<class ParameterDeclarationClauseAST>& parameterDeclarationClause ) { - m_parameterDeclarationClause = parameterDeclarationClause; - if( m_parameterDeclarationClause.get() ) m_parameterDeclarationClause->setParent( this ); + m_parameterDeclarationClause = std::move(parameterDeclarationClause); + if( m_parameterDeclarationClause ) m_parameterDeclarationClause->setParent( this ); } void DeclaratorAST::setConstant( AST::Node& constant ) { - m_constant = constant; - if( m_constant.get() ) m_constant->setParent( this ); + m_constant = std::move(constant); + if( m_constant ) m_constant->setParent( this ); } void DeclaratorAST::setExceptionSpecification( GroupAST::Node& exceptionSpecification ) { - m_exceptionSpecification = exceptionSpecification; - if( m_exceptionSpecification.get() ) m_exceptionSpecification->setParent( this ); + m_exceptionSpecification = std::move(exceptionSpecification); + if( m_exceptionSpecification ) m_exceptionSpecification->setParent( this ); } void DeclaratorAST::addPtrOp( AST::Node& ptrOp ) { - if( !ptrOp.get() ) + if( !ptrOp ) return; ptrOp->setParent( this ); @@ -745,14 +745,14 @@ InitDeclaratorAST::InitDeclaratorAST() void InitDeclaratorAST::setDeclarator( DeclaratorAST::Node& declarator ) { - m_declarator = declarator; - if( m_declarator.get() ) m_declarator->setParent( this ); + m_declarator = std::move(declarator); + if( m_declarator ) m_declarator->setParent( this ); } void InitDeclaratorAST::setInitializer( AST::Node& initializer ) { - m_initializer = initializer; - if( m_initializer.get() ) m_initializer->setParent( this ); + m_initializer = std::move(initializer); + if( m_initializer ) m_initializer->setParent( this ); } // -------------------------------------------------------------------------- @@ -762,38 +762,38 @@ FunctionDefinitionAST::FunctionDefinitionAST() void FunctionDefinitionAST::setFunctionSpecifier( GroupAST::Node& functionSpecifier ) { - m_functionSpecifier = functionSpecifier; - if( m_functionSpecifier.get() ) m_functionSpecifier->setParent( this ); + m_functionSpecifier = std::move(functionSpecifier); + if( m_functionSpecifier ) m_functionSpecifier->setParent( this ); } void FunctionDefinitionAST::setStorageSpecifier( GroupAST::Node& storageSpecifier ) { - m_storageSpecifier = storageSpecifier; - if( m_storageSpecifier.get() ) m_storageSpecifier->setParent( this ); + m_storageSpecifier = std::move(storageSpecifier); + if( m_storageSpecifier ) m_storageSpecifier->setParent( this ); } void FunctionDefinitionAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void FunctionDefinitionAST::setInitDeclarator( InitDeclaratorAST::Node& initDeclarator ) { - m_initDeclarator = initDeclarator; - if( m_initDeclarator.get() ) m_initDeclarator->setParent( this ); + m_initDeclarator = std::move(initDeclarator); + if( m_initDeclarator ) m_initDeclarator->setParent( this ); } void FunctionDefinitionAST::setFunctionBody( StatementListAST::Node& functionBody ) { - m_functionBody = functionBody; - if( m_functionBody.get() ) m_functionBody->setParent( this ); + m_functionBody = std::move(functionBody); + if( m_functionBody ) m_functionBody->setParent( this ); } void FunctionDefinitionAST::setWinDeclSpec( GroupAST::Node& winDeclSpec ) { - m_winDeclSpec = winDeclSpec; - if( m_winDeclSpec.get() ) m_winDeclSpec->setParent( this ); + m_winDeclSpec = std::move(winDeclSpec); + if( m_winDeclSpec ) m_winDeclSpec->setParent( this ); } // -------------------------------------------------------------------------- @@ -804,7 +804,7 @@ StatementListAST::StatementListAST() void StatementListAST::addStatement( StatementAST::Node& statement ) { - if( !statement.get() ) + if( !statement ) return; statement->setParent( this ); @@ -818,20 +818,20 @@ IfStatementAST::IfStatementAST() void IfStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void IfStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } void IfStatementAST::setElseStatement( StatementAST::Node& elseStatement ) { - m_elseStatement = elseStatement; - if( m_elseStatement.get() ) m_elseStatement->setParent( this ); + m_elseStatement = std::move(elseStatement); + if( m_elseStatement ) m_elseStatement->setParent( this ); } // -------------------------------------------------------------------------- @@ -841,14 +841,14 @@ WhileStatementAST::WhileStatementAST() void WhileStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void WhileStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } // -------------------------------------------------------------------------- @@ -858,14 +858,14 @@ DoStatementAST::DoStatementAST() void DoStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void DoStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } // -------------------------------------------------------------------------- @@ -875,26 +875,26 @@ ForStatementAST::ForStatementAST() void ForStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void ForStatementAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } void ForStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } void ForStatementAST::setInitStatement( StatementAST::Node& initStatement ) { - m_initStatement = initStatement; - if( m_initStatement.get() ) m_initStatement->setParent( this ); + m_initStatement = std::move(initStatement); + if( m_initStatement ) m_initStatement->setParent( this ); } // -------------------------------------------------------------------------- @@ -904,14 +904,14 @@ SwitchStatementAST::SwitchStatementAST() void SwitchStatementAST::setCondition( ConditionAST::Node& condition ) { - m_condition = condition; - if( m_condition.get() ) m_condition->setParent( this ); + m_condition = std::move(condition); + if( m_condition ) m_condition->setParent( this ); } void SwitchStatementAST::setStatement( StatementAST::Node& statement ) { - m_statement = statement; - if( m_statement.get() ) m_statement->setParent( this ); + m_statement = std::move(statement); + if( m_statement ) m_statement->setParent( this ); } // -------------------------------------------------------------------------- @@ -921,8 +921,8 @@ DeclarationStatementAST::DeclarationStatementAST() void DeclarationStatementAST::setDeclaration( DeclarationAST::Node& declaration ) { - m_declaration = declaration; - if( m_declaration.get() ) m_declaration->setParent( this ); + m_declaration = std::move(declaration); + if( m_declaration ) m_declaration->setParent( this ); } // -------------------------------------------------------------------------- @@ -932,8 +932,8 @@ ExpressionStatementAST::ExpressionStatementAST() void ExpressionStatementAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } @@ -944,32 +944,32 @@ ParameterDeclarationAST::ParameterDeclarationAST() void ParameterDeclarationAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void ParameterDeclarationAST::setDeclarator( DeclaratorAST::Node& declarator ) { - m_declarator = declarator; - if( m_declarator.get() ) m_declarator->setParent( this ); + m_declarator = std::move(declarator); + if( m_declarator ) m_declarator->setParent( this ); } void ParameterDeclarationAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } TQString ParameterDeclarationAST::text() const { TQString str; - if( m_typeSpec.get() ) + if( m_typeSpec ) str += m_typeSpec->text() + ' '; - if( m_declarator.get() ) + if( m_declarator ) str += m_declarator->text(); - if( m_expression.get() ) + if( m_expression ) str += TQString( " = " ) + m_expression->text(); return str; @@ -983,7 +983,7 @@ ParameterDeclarationListAST::ParameterDeclarationListAST() void ParameterDeclarationListAST::addParameter( ParameterDeclarationAST::Node& parameter ) { - if( !parameter.get() ) + if( !parameter ) return; parameter->setParent( this ); @@ -1011,24 +1011,24 @@ ParameterDeclarationClauseAST::ParameterDeclarationClauseAST() void ParameterDeclarationClauseAST::setParameterDeclarationList( ParameterDeclarationListAST::Node& parameterDeclarationList ) { - m_parameterDeclarationList = parameterDeclarationList; - if( m_parameterDeclarationList.get() ) m_parameterDeclarationList->setParent( this ); + m_parameterDeclarationList = std::move(parameterDeclarationList); + if( m_parameterDeclarationList ) m_parameterDeclarationList->setParent( this ); } void ParameterDeclarationClauseAST::setEllipsis( AST::Node& ellipsis ) { - m_ellipsis = ellipsis; - if( m_ellipsis.get() ) m_ellipsis->setParent( this ); + m_ellipsis = std::move(ellipsis); + if( m_ellipsis ) m_ellipsis->setParent( this ); } TQString ParameterDeclarationClauseAST::text() const { TQString str; - if( m_parameterDeclarationList.get() ) + if( m_parameterDeclarationList ) str += m_parameterDeclarationList->text(); - if( m_ellipsis.get() ) + if( m_ellipsis ) str += " ..."; return str; @@ -1043,7 +1043,7 @@ GroupAST::GroupAST() void GroupAST::addNode( AST::Node& node ) { - if( !node.get() ) + if( !node ) return; node->setParent( this ); @@ -1071,7 +1071,7 @@ AccessDeclarationAST::AccessDeclarationAST() void AccessDeclarationAST::addAccess( AST::Node& access ) { - if( !access.get() ) + if( !access ) return; access->setParent( this ); @@ -1098,26 +1098,26 @@ TypeParameterAST::TypeParameterAST() void TypeParameterAST::setKind( AST::Node& kind ) { - m_kind = kind; - if( m_kind.get() ) m_kind->setParent( this ); + m_kind = std::move(kind); + if( m_kind ) m_kind->setParent( this ); } -void TypeParameterAST::setTemplateParameterList( std::auto_ptr<class TemplateParameterListAST>& templateParameterList ) +void TypeParameterAST::setTemplateParameterList( std::unique_ptr<class TemplateParameterListAST>& templateParameterList ) { - m_templateParameterList = templateParameterList; - if( m_templateParameterList.get() ) m_templateParameterList->setParent( this ); + m_templateParameterList = std::move(templateParameterList); + if( m_templateParameterList ) m_templateParameterList->setParent( this ); } void TypeParameterAST::setName( NameAST::Node& name ) { - m_name = name; - if( m_name.get() ) m_name->setParent( this ); + m_name = std::move(name); + if( m_name ) m_name->setParent( this ); } void TypeParameterAST::setTypeId( AST::Node& typeId ) { - m_typeId = typeId; - if( m_typeId.get() ) m_typeId->setParent( this ); + m_typeId = std::move(typeId); + if( m_typeId ) m_typeId->setParent( this ); } // -------------------------------------------------------------------------- @@ -1127,14 +1127,14 @@ TemplateParameterAST::TemplateParameterAST() void TemplateParameterAST::setTypeParameter( TypeParameterAST::Node& typeParameter ) { - m_typeParameter = typeParameter; - if( m_typeParameter.get() ) m_typeParameter->setParent( this ); + m_typeParameter = std::move(typeParameter); + if( m_typeParameter ) m_typeParameter->setParent( this ); } void TemplateParameterAST::setTypeValueParameter( ParameterDeclarationAST::Node& typeValueParameter ) { - m_typeValueParameter = typeValueParameter; - if( m_typeValueParameter.get() ) m_typeValueParameter->setParent( this ); + m_typeValueParameter = std::move(typeValueParameter); + if( m_typeValueParameter ) m_typeValueParameter->setParent( this ); } // -------------------------------------------------------------------------- @@ -1145,7 +1145,7 @@ TemplateParameterListAST::TemplateParameterListAST() void TemplateParameterListAST::addTemplateParameter( TemplateParameterAST::Node& templateParameter ) { - if( !templateParameter.get() ) + if( !templateParameter ) return; templateParameter->setParent( this ); @@ -1159,25 +1159,25 @@ ConditionAST::ConditionAST() void ConditionAST::setTypeSpec( TypeSpecifierAST::Node& typeSpec ) { - m_typeSpec = typeSpec; - if( m_typeSpec.get() ) m_typeSpec->setParent( this ); + m_typeSpec = std::move(typeSpec); + if( m_typeSpec ) m_typeSpec->setParent( this ); } void ConditionAST::setDeclarator( DeclaratorAST::Node& declarator ) { - m_declarator = declarator; - if( m_declarator.get() ) m_declarator->setParent( this ); + m_declarator = std::move(declarator); + if( m_declarator ) m_declarator->setParent( this ); } void ConditionAST::setExpression( AST::Node& expression ) { - m_expression = expression; - if( m_expression.get() ) m_expression->setParent( this ); + m_expression = std::move(expression); + if( m_expression ) m_expression->setParent( this ); } void ClassSpecifierAST::setWinDeclSpec( GroupAST::Node & winDeclSpec ) { - m_winDeclSpec = winDeclSpec; - if( m_winDeclSpec.get() ) m_winDeclSpec->setParent( this ); + m_winDeclSpec = std::move(winDeclSpec); + if( m_winDeclSpec ) m_winDeclSpec->setParent( this ); } diff --git a/umbrello/umbrello/codeimport/kdevcppparser/ast.h b/umbrello/umbrello/codeimport/kdevcppparser/ast.h index 103276d5..d98044ef 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/ast.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/ast.h @@ -124,7 +124,7 @@ struct Slice class AST { public: - typedef std::auto_ptr<AST> Node; + typedef std::unique_ptr<AST> Node; enum { Type=NodeType_Generic }; DECLARE_ALLOC( AST ) @@ -192,7 +192,7 @@ private: class GroupAST: public AST { public: - typedef std::auto_ptr<GroupAST> Node; + typedef std::unique_ptr<GroupAST> Node; enum { Type = NodeType_Group }; DECLARE_ALLOC( GroupAST ) @@ -217,7 +217,7 @@ private: class TemplateArgumentListAST: public AST { public: - typedef std::auto_ptr<TemplateArgumentListAST> Node; + typedef std::unique_ptr<TemplateArgumentListAST> Node; enum { Type = NodeType_TemplateArgumentList }; DECLARE_ALLOC( TemplateArgumentListAST ) @@ -241,7 +241,7 @@ private: class ClassOrNamespaceNameAST: public AST { public: - typedef std::auto_ptr<ClassOrNamespaceNameAST> Node; + typedef std::unique_ptr<ClassOrNamespaceNameAST> Node; enum { Type = NodeType_ClassOrNamespaceName }; DECLARE_ALLOC( ClassOrNamespaceNameAST ) @@ -269,7 +269,7 @@ private: class NameAST: public AST { public: - typedef std::auto_ptr<NameAST> Node; + typedef std::unique_ptr<NameAST> Node; enum { Type = NodeType_Name }; DECLARE_ALLOC( NameAST ) @@ -301,7 +301,7 @@ private: class TypeParameterAST: public AST { public: - typedef std::auto_ptr<TypeParameterAST> Node; + typedef std::unique_ptr<TypeParameterAST> Node; enum { Type = NodeType_TypeParameter }; DECLARE_ALLOC( TypeParameterAST ) @@ -313,7 +313,7 @@ public: void setKind( AST::Node& kind ); class TemplateParameterListAST* templateParameterList() { return m_templateParameterList.get(); } - void setTemplateParameterList( std::auto_ptr<class TemplateParameterListAST>& templateParameterList ); + void setTemplateParameterList( std::unique_ptr<class TemplateParameterListAST>& templateParameterList ); NameAST* name() { return m_name.get(); } void setName( NameAST::Node& name ); @@ -323,7 +323,7 @@ public: private: AST::Node m_kind; - std::auto_ptr<class TemplateParameterListAST> m_templateParameterList; + std::unique_ptr<class TemplateParameterListAST> m_templateParameterList; NameAST::Node m_name; AST::Node m_typeId; @@ -335,7 +335,7 @@ private: class DeclarationAST: public AST { public: - typedef std::auto_ptr<DeclarationAST> Node; + typedef std::unique_ptr<DeclarationAST> Node; enum { Type = NodeType_Declaration }; DECLARE_ALLOC( DeclarationAST ) @@ -351,7 +351,7 @@ private: class AccessDeclarationAST: public DeclarationAST { public: - typedef std::auto_ptr<AccessDeclarationAST> Node; + typedef std::unique_ptr<AccessDeclarationAST> Node; enum { Type = NodeType_AccessDeclaration }; DECLARE_ALLOC( AccessDeclarationAST ) @@ -375,7 +375,7 @@ private: class TypeSpecifierAST: public AST { public: - typedef std::auto_ptr<TypeSpecifierAST> Node; + typedef std::unique_ptr<TypeSpecifierAST> Node; enum { Type = NodeType_TypeSpecifier }; DECLARE_ALLOC( TypeSpecifierAST ) @@ -407,7 +407,7 @@ private: class BaseSpecifierAST: public AST { public: - typedef std::auto_ptr<BaseSpecifierAST> Node; + typedef std::unique_ptr<BaseSpecifierAST> Node; enum { Type = NodeType_BaseSpecifier }; DECLARE_ALLOC( BaseSpecifierAST ) @@ -437,7 +437,7 @@ private: class BaseClauseAST: public AST { public: - typedef std::auto_ptr<BaseClauseAST> Node; + typedef std::unique_ptr<BaseClauseAST> Node; enum { Type = NodeType_BaseClause }; DECLARE_ALLOC( BaseClauseAST ) @@ -459,7 +459,7 @@ private: class ClassSpecifierAST: public TypeSpecifierAST { public: - typedef std::auto_ptr<ClassSpecifierAST> Node; + typedef std::unique_ptr<ClassSpecifierAST> Node; enum { Type = NodeType_ClassSpecifier }; DECLARE_ALLOC( ClassSpecifierAST ) @@ -493,7 +493,7 @@ private: class EnumeratorAST: public AST { public: - typedef std::auto_ptr<EnumeratorAST> Node; + typedef std::unique_ptr<EnumeratorAST> Node; enum { Type = NodeType_Enumerator }; DECLARE_ALLOC( EnumeratorAST ) @@ -519,7 +519,7 @@ private: class EnumSpecifierAST: public TypeSpecifierAST { public: - typedef std::auto_ptr<EnumSpecifierAST> Node; + typedef std::unique_ptr<EnumSpecifierAST> Node; enum { Type = NodeType_EnumSpecifier }; DECLARE_ALLOC( EnumSpecifierAST ) @@ -541,7 +541,7 @@ private: class ElaboratedTypeSpecifierAST: public TypeSpecifierAST { public: - typedef std::auto_ptr<ElaboratedTypeSpecifierAST> Node; + typedef std::unique_ptr<ElaboratedTypeSpecifierAST> Node; enum { Type = NodeType_ElaboratedTypeSpecifier }; DECLARE_ALLOC( ElaboratedTypeSpecifierAST ) @@ -566,7 +566,7 @@ private: class LinkageBodyAST: public AST { public: - typedef std::auto_ptr<LinkageBodyAST> Node; + typedef std::unique_ptr<LinkageBodyAST> Node; enum { Type = NodeType_LinkageBody }; DECLARE_ALLOC( LinkageBodyAST ) @@ -588,7 +588,7 @@ private: class LinkageSpecificationAST: public DeclarationAST { public: - typedef std::auto_ptr<LinkageSpecificationAST> Node; + typedef std::unique_ptr<LinkageSpecificationAST> Node; enum { Type = NodeType_LinkageSpecification }; DECLARE_ALLOC( LinkageSpecificationAST ) @@ -618,7 +618,7 @@ private: class NamespaceAST: public DeclarationAST { public: - typedef std::auto_ptr<NamespaceAST> Node; + typedef std::unique_ptr<NamespaceAST> Node; enum { Type = NodeType_Namespace }; DECLARE_ALLOC( NamespaceAST ) @@ -644,7 +644,7 @@ private: class NamespaceAliasAST: public DeclarationAST { public: - typedef std::auto_ptr<NamespaceAliasAST> Node; + typedef std::unique_ptr<NamespaceAliasAST> Node; enum { Type = NodeType_NamespaceAlias }; DECLARE_ALLOC( NamespaceAliasAST ) @@ -670,7 +670,7 @@ private: class UsingAST: public DeclarationAST { public: - typedef std::auto_ptr<UsingAST> Node; + typedef std::unique_ptr<UsingAST> Node; enum { Type = NodeType_Using }; DECLARE_ALLOC( UsingAST ) @@ -696,7 +696,7 @@ private: class UsingDirectiveAST: public DeclarationAST { public: - typedef std::auto_ptr<UsingDirectiveAST> Node; + typedef std::unique_ptr<UsingDirectiveAST> Node; enum { Type = NodeType_UsingDirective }; DECLARE_ALLOC( UsingDirectiveAST ) @@ -718,7 +718,7 @@ private: class DeclaratorAST: public AST { public: - typedef std::auto_ptr<DeclaratorAST> Node; + typedef std::unique_ptr<DeclaratorAST> Node; enum { Type = NodeType_Declarator }; DECLARE_ALLOC( DeclaratorAST ) @@ -742,7 +742,7 @@ public: void addArrayDimension( AST::Node& arrayDimension ); class ParameterDeclarationClauseAST* parameterDeclarationClause() { return m_parameterDeclarationClause.get(); } - void setParameterDeclarationClause( std::auto_ptr<class ParameterDeclarationClauseAST>& parameterDeclarationClause ); + void setParameterDeclarationClause( std::unique_ptr<class ParameterDeclarationClauseAST>& parameterDeclarationClause ); // ### replace 'constant' with cvQualify AST* constant() { return m_constant.get(); } @@ -757,7 +757,7 @@ private: NameAST::Node m_declaratorId; AST::Node m_bitfieldInitialization; TQPtrList<AST> m_arrayDimensionList; - std::auto_ptr<class ParameterDeclarationClauseAST> m_parameterDeclarationClause; + std::unique_ptr<class ParameterDeclarationClauseAST> m_parameterDeclarationClause; AST::Node m_constant; GroupAST::Node m_exceptionSpecification; @@ -769,7 +769,7 @@ private: class ParameterDeclarationAST: public AST { public: - typedef std::auto_ptr<ParameterDeclarationAST> Node; + typedef std::unique_ptr<ParameterDeclarationAST> Node; enum { Type = NodeType_ParameterDeclaration }; DECLARE_ALLOC( ParameterDeclarationAST ) @@ -801,7 +801,7 @@ private: class ParameterDeclarationListAST: public AST { public: - typedef std::auto_ptr<ParameterDeclarationListAST> Node; + typedef std::unique_ptr<ParameterDeclarationListAST> Node; enum { Type = NodeType_ParameterDeclarationList }; DECLARE_ALLOC( ParameterDeclarationListAST ) @@ -825,7 +825,7 @@ private: class ParameterDeclarationClauseAST: public AST { public: - typedef std::auto_ptr<ParameterDeclarationClauseAST> Node; + typedef std::unique_ptr<ParameterDeclarationClauseAST> Node; enum { Type = NodeType_ParameterDeclarationClause }; DECLARE_ALLOC( ParameterDeclarationClauseAST ) @@ -854,7 +854,7 @@ private: class InitDeclaratorAST: public AST { public: - typedef std::auto_ptr<InitDeclaratorAST> Node; + typedef std::unique_ptr<InitDeclaratorAST> Node; enum { Type = NodeType_InitDeclarator }; DECLARE_ALLOC( InitDeclaratorAST ) @@ -880,7 +880,7 @@ private: class InitDeclaratorListAST: public AST { public: - typedef std::auto_ptr<InitDeclaratorListAST> Node; + typedef std::unique_ptr<InitDeclaratorListAST> Node; enum { Type = NodeType_InitDeclaratorList }; DECLARE_ALLOC( InitDeclaratorListAST ) @@ -902,7 +902,7 @@ private: class TypedefAST: public DeclarationAST { public: - typedef std::auto_ptr<TypedefAST> Node; + typedef std::unique_ptr<TypedefAST> Node; enum { Type = NodeType_Typedef }; DECLARE_ALLOC( TypedefAST ) @@ -928,7 +928,7 @@ private: class TemplateParameterAST: public AST { public: - typedef std::auto_ptr<TemplateParameterAST> Node; + typedef std::unique_ptr<TemplateParameterAST> Node; enum { Type = NodeType_TemplateParameter }; DECLARE_ALLOC( TemplateParameterAST ) @@ -954,7 +954,7 @@ private: class TemplateParameterListAST: public AST { public: - typedef std::auto_ptr<TemplateParameterListAST> Node; + typedef std::unique_ptr<TemplateParameterListAST> Node; enum { Type = NodeType_TemplateParameterList }; DECLARE_ALLOC( TemplateParameterListAST ) @@ -976,7 +976,7 @@ private: class TemplateDeclarationAST: public DeclarationAST { public: - typedef std::auto_ptr<TemplateDeclarationAST> Node; + typedef std::unique_ptr<TemplateDeclarationAST> Node; enum { Type = NodeType_TemplateDeclaration }; DECLARE_ALLOC( TemplateDeclarationAST ) @@ -1006,7 +1006,7 @@ private: class SimpleDeclarationAST: public DeclarationAST { public: - typedef std::auto_ptr<SimpleDeclarationAST> Node; + typedef std::unique_ptr<SimpleDeclarationAST> Node; enum { Type = NodeType_SimpleDeclaration }; DECLARE_ALLOC( SimpleDeclarationAST ) @@ -1044,7 +1044,7 @@ private: class StatementAST: public AST { public: - typedef std::auto_ptr<StatementAST> Node; + typedef std::unique_ptr<StatementAST> Node; enum { Type = NodeType_Statement }; DECLARE_ALLOC( StatementAST ) @@ -1060,7 +1060,7 @@ private: class ExpressionStatementAST: public StatementAST { public: - typedef std::auto_ptr<ExpressionStatementAST> Node; + typedef std::unique_ptr<ExpressionStatementAST> Node; enum { Type = NodeType_ExpressionStatement }; DECLARE_ALLOC( ExpressionStatementAST ) @@ -1082,7 +1082,7 @@ private: class ConditionAST: public AST { public: - typedef std::auto_ptr<ConditionAST> Node; + typedef std::unique_ptr<ConditionAST> Node; enum { Type = NodeType_Condition }; DECLARE_ALLOC( ConditionAST ) @@ -1112,7 +1112,7 @@ private: class IfStatementAST: public StatementAST { public: - typedef std::auto_ptr<IfStatementAST> Node; + typedef std::unique_ptr<IfStatementAST> Node; enum { Type = NodeType_IfStatement }; DECLARE_ALLOC( IfStatementAST ) @@ -1142,7 +1142,7 @@ private: class WhileStatementAST: public StatementAST { public: - typedef std::auto_ptr<WhileStatementAST> Node; + typedef std::unique_ptr<WhileStatementAST> Node; enum { Type = NodeType_WhileStatement }; DECLARE_ALLOC( WhileStatementAST ) @@ -1168,7 +1168,7 @@ private: class DoStatementAST: public StatementAST { public: - typedef std::auto_ptr<DoStatementAST> Node; + typedef std::unique_ptr<DoStatementAST> Node; enum { Type = NodeType_DoStatement }; DECLARE_ALLOC( DoStatementAST ) @@ -1194,7 +1194,7 @@ private: class ForStatementAST: public StatementAST { public: - typedef std::auto_ptr<ForStatementAST> Node; + typedef std::unique_ptr<ForStatementAST> Node; enum { Type = NodeType_ForStatement }; DECLARE_ALLOC( ForStatementAST ) @@ -1228,7 +1228,7 @@ private: class SwitchStatementAST: public StatementAST { public: - typedef std::auto_ptr<SwitchStatementAST> Node; + typedef std::unique_ptr<SwitchStatementAST> Node; enum { Type = NodeType_SwitchStatement }; DECLARE_ALLOC( SwitchStatementAST ) @@ -1254,7 +1254,7 @@ private: class StatementListAST: public StatementAST { public: - typedef std::auto_ptr<StatementListAST> Node; + typedef std::unique_ptr<StatementListAST> Node; enum { Type = NodeType_StatementList }; DECLARE_ALLOC( StatementListAST ) @@ -1276,7 +1276,7 @@ private: class DeclarationStatementAST: public StatementAST { public: - typedef std::auto_ptr<DeclarationStatementAST> Node; + typedef std::unique_ptr<DeclarationStatementAST> Node; enum { Type = NodeType_DeclarationStatement }; DECLARE_ALLOC( DeclarationStatementAST ) @@ -1298,7 +1298,7 @@ private: class FunctionDefinitionAST: public DeclarationAST { public: - typedef std::auto_ptr<FunctionDefinitionAST> Node; + typedef std::unique_ptr<FunctionDefinitionAST> Node; enum { Type = NodeType_FunctionDefinition }; DECLARE_ALLOC( FunctionDefinitionAST ) @@ -1341,7 +1341,7 @@ private: class TranslationUnitAST: public AST { public: - typedef std::auto_ptr<TranslationUnitAST> Node; + typedef std::unique_ptr<TranslationUnitAST> Node; enum { Type = NodeType_TranslationUnit }; DECLARE_ALLOC( TranslationUnitAST ) diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp index daef65da..17b1b2f7 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp @@ -280,7 +280,6 @@ void Driver::setupLexer( Lexer * lexer ) lexer->addSkipWord( "ANTLR_USE_NAMESPACE", SkipWordAndArguments ); lexer->addSkipWord( "ANTLR_USING_NAMESPACE", SkipWordAndArguments ); lexer->addSkipWord( "ANTLR_END_NAMESPACE" ); - lexer->addSkipWord( "ANTLR_C_USING", SkipWordAndArguments ); lexer->addSkipWord( "ANTLR_API" ); // gnu @@ -322,7 +321,7 @@ void Driver::setupLexer( Lexer * lexer ) lexer->addSkipWord( "EXPORT_DOCKCLASS" ); lexer->addSkipWord( "K_EXPORT_COMPONENT_FACTORY", SkipWordAndArguments ); lexer->addSkipWord( "K_SYCOCAFACTORY", SkipWordAndArguments ); - lexer->addSkipWord( "KDE_DEPRECATED" ); + lexer->addSkipWord( "TDE_DEPRECATED" ); // qt lexer->addSkipWord( "TQ_OVERRIDE", SkipWordAndArguments ); @@ -340,8 +339,6 @@ void Driver::setupLexer( Lexer * lexer ) lexer->addSkipWord( "TQ_REFCOUNT" ); lexer->addSkipWord( "TQ_EXPLICIT" ); lexer->addSkipWord( "QMAC_PASCAL" ); - lexer->addSkipWord( "QT_STATIC_CONST" ); - lexer->addSkipWord( "QT_STATIC_CONST_IMPL" ); lexer->addSkipWord( "TQT_WIN_PAINTER_MEMBERS" ); lexer->addSkipWord( "TQT_NC_MSGBOX" ); lexer->addSkipWord( "TQ_VARIANT_AS", SkipWordAndArguments ); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp index 133d6726..21334479 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.cpp @@ -20,6 +20,6 @@ #include "errors.h" #include <tdelocale.h> -QT_STATIC_CONST_IMPL Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") ); -QT_STATIC_CONST_IMPL Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") ); -QT_STATIC_CONST_IMPL Error& Errors::ParseError = Error( 3, -1, i18n("Parse Error before '%1'") ); +const Error& Errors::InternalError = Error( 1, -1, i18n("Internal Error") ); +const Error& Errors::SyntaxError = Error( 2, -1, i18n("Syntax Error before '%1'") ); +const Error& Errors::ParseError = Error( 3, -1, i18n("Parse Error before '%1'") ); diff --git a/umbrello/umbrello/codeimport/kdevcppparser/errors.h b/umbrello/umbrello/codeimport/kdevcppparser/errors.h index 6751475e..5ccd0b5a 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/errors.h +++ b/umbrello/umbrello/codeimport/kdevcppparser/errors.h @@ -35,9 +35,9 @@ struct Error{ class Errors{ public: - QT_STATIC_CONST Error& InternalError; - QT_STATIC_CONST Error& SyntaxError; - QT_STATIC_CONST Error& ParseError; + static const Error& InternalError; + static const Error& SyntaxError; + static const Error& ParseError; }; diff --git a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp index adc729e9..f5748859 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/parser.cpp @@ -327,7 +327,7 @@ bool Parser::skipCommaExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -379,7 +379,7 @@ bool Parser::skipExpression( AST::Node& node ) { AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); } return true; @@ -430,7 +430,7 @@ bool Parser::parseName( NameAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -443,7 +443,7 @@ bool Parser::parseTranslationUnit( TranslationUnitAST::Node& node ) m_problems = 0; TranslationUnitAST::Node tun = CreateNode<TranslationUnitAST>(); - node = tun; + node = std::move(tun); while( !lex->lookAhead(0).isNull() ){ DeclarationAST::Node def; int startDecl = lex->index(); @@ -548,7 +548,7 @@ bool Parser::parseDeclaration( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -602,7 +602,7 @@ bool Parser::parseLinkageSpecification( DeclarationAST::Node& node ) UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -619,7 +619,7 @@ bool Parser::parseLinkageBody( LinkageBodyAST::Node& node ) lex->nextToken(); LinkageBodyAST::Node lba = CreateNode<LinkageBodyAST>(); - node = lba; + node = std::move(lba); while( !lex->lookAhead(0).isNull() ){ int tk = lex->lookAhead( 0 ); @@ -678,7 +678,7 @@ bool Parser::parseNamespace( DeclarationAST::Node& node ) ast->setNamespaceName( namespaceName ); ast->setAliasName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } else { reportError( i18n("namespace expected") ); @@ -697,7 +697,7 @@ bool Parser::parseNamespace( DeclarationAST::Node& node ) ast->setLinkageBody( linkageBody ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -740,7 +740,7 @@ bool Parser::parseUsing( DeclarationAST::Node& node ) ADVANCE( ';', ";" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -767,7 +767,7 @@ bool Parser::parseUsingDirective( DeclarationAST::Node& node ) UsingDirectiveAST::Node ast = CreateNode<UsingDirectiveAST>(); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -787,7 +787,7 @@ bool Parser::parseOperatorFunctionId( AST::Node& node ) AST::Node op; if( parseOperator(op) ){ AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); UPDATE_POS( node, start, lex->index() ); return true; } else { @@ -811,7 +811,7 @@ bool Parser::parseOperatorFunctionId( AST::Node& node ) ; AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); UPDATE_POS( node, start, lex->index() ); return true; } @@ -848,7 +848,7 @@ bool Parser::parseTemplateArgumentList( TemplateArgumentListAST::Node& node, boo } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -882,7 +882,7 @@ bool Parser::parseTypedef( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -916,7 +916,7 @@ bool Parser::parseTemplateDeclaration( DeclarationAST::Node& node ) lex->nextToken(); AST::Node n = CreateNode<AST>(); UPDATE_POS( n, startExport, lex->index() ); - exp = n; + exp = std::move(n); } if( lex->lookAhead(0) != Token_template ){ @@ -943,7 +943,7 @@ bool Parser::parseTemplateDeclaration( DeclarationAST::Node& node ) ast->setTemplateParameterList( params ); ast->setDeclaration( def ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1037,7 +1037,7 @@ bool Parser::parseCvQualify( GroupAST::Node& node ) //kdDebug(9007)<< "-----------------> token = " << lex->lookAhead(0).text() << endl; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1094,7 +1094,7 @@ bool Parser::parseSimpleTypeSpecifier( TypeSpecifierAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1122,7 +1122,7 @@ bool Parser::parsePtrOperator( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1287,7 +1287,7 @@ bool Parser::parseDeclarator( DeclaratorAST::Node& node ) update_pos: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1384,7 +1384,7 @@ bool Parser::parseAbstractDeclarator( DeclaratorAST::Node& node ) UPDATE_POS: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1453,7 +1453,7 @@ bool Parser::parseEnumSpecifier( TypeSpecifierAST::Node& node ) lex->nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1488,7 +1488,7 @@ bool Parser::parseTemplateParameterList( TemplateParameterListAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1516,7 +1516,7 @@ bool Parser::parseTemplateParameter( TemplateParameterAST::Node& node ) ok: UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1604,7 +1604,7 @@ bool Parser::parseTypeParameter( TypeParameterAST::Node& node ) UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1633,7 +1633,7 @@ bool Parser::parseStorageClassSpecifier( GroupAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1662,7 +1662,7 @@ bool Parser::parseFunctionSpecifier( GroupAST::Node& node ) return false; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1683,7 +1683,7 @@ bool Parser::parseTypeId( AST::Node& node ) parseAbstractDeclarator( decl ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1718,7 +1718,7 @@ bool Parser::parseInitDeclaratorList( InitDeclaratorListAST::Node& node ) //kdDebug(9007)<< "--- tok = " << lex->lookAhead(0).text() << " -- " << "Parser::parseInitDeclaratorList() -- end" << endl; UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1757,7 +1757,7 @@ good: /// @todo add ellipsis UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1795,7 +1795,7 @@ bool Parser::parseParameterDeclarationList( ParameterDeclarationListAST::Node& n } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1838,7 +1838,7 @@ bool Parser::parseParameterDeclaration( ParameterDeclarationAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1855,7 +1855,7 @@ bool Parser::parseClassSpecifier( TypeSpecifierAST::Node& node ) int kind = lex->lookAhead( 0 ); if( kind == Token_class || kind == Token_struct || kind == Token_union ){ AST::Node asn = CreateNode<AST>(); - classKey = asn; + classKey = std::move(asn); lex->nextToken(); UPDATE_POS( classKey, classKeyStart, lex->index() ); } else { @@ -1916,7 +1916,7 @@ bool Parser::parseClassSpecifier( TypeSpecifierAST::Node& node ) lex->nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -1932,7 +1932,7 @@ bool Parser::parseAccessSpecifier( AST::Node& node ) case Token_protected: case Token_private: { AST::Node asn = CreateNode<AST>(); - node = asn; + node = std::move(asn); lex->nextToken(); UPDATE_POS( node, start, lex->index() ); return true; @@ -1991,7 +1991,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) ast->addAccess( n ); ADVANCE( ':', ":" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } else if( parseTypedef(node) ){ return true; @@ -2012,7 +2012,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) } ADVANCE( ':', ":" ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2045,7 +2045,7 @@ bool Parser::parseMemberSpecification( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2101,7 +2101,7 @@ bool Parser::parseElaboratedTypeSpecifier( TypeSpecifierAST::Node& node ) ast->setKind( kind ); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2135,7 +2135,7 @@ bool Parser::parseExceptionSpecification( GroupAST::Node& node ) ast->addNode( ellipsis ); lex->nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); } else { parseTypeIdList( node ); } @@ -2164,7 +2164,7 @@ bool Parser::parseEnumerator( EnumeratorAST::Node& node ) lex->nextToken(); EnumeratorAST::Node ena = CreateNode<EnumeratorAST>(); - node = ena; + node = std::move(ena); AST::Node id = CreateNode<AST>(); UPDATE_POS( id, start, lex->index() ); @@ -2203,7 +2203,7 @@ bool Parser::parseInitDeclarator( InitDeclaratorAST::Node& node ) ast->setDeclarator( decl ); ast->setInitializer( init ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2243,7 +2243,7 @@ bool Parser::parseBaseClause( BaseClauseAST::Node& node ) return false; UPDATE_POS( bca, start, lex->index() ); - node = bca; + node = std::move(bca); return true; } @@ -2340,7 +2340,7 @@ bool Parser::parseTypeIdList( GroupAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2377,7 +2377,7 @@ bool Parser::parseBaseSpecifier( BaseSpecifierAST::Node& node ) ast->setAccess( access ); ast->setName( name ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2483,7 +2483,7 @@ bool Parser::parseUnqualifiedName( ClassOrNamespaceNameAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2518,7 +2518,7 @@ bool Parser::skipExpressionStatement( StatementAST::Node& node ) ExpressionStatementAST::Node ast = CreateNode<ExpressionStatementAST>(); ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2608,7 +2608,7 @@ bool Parser::parseCondition( ConditionAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2623,7 +2623,7 @@ bool Parser::parseCondition( ConditionAST::Node& node ) ast->setExpression( expr ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2653,7 +2653,7 @@ bool Parser::parseWhileStatement( StatementAST::Node& node ) ast->setCondition( cond ); ast->setStatement( body ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2687,7 +2687,7 @@ bool Parser::parseDoStatement( StatementAST::Node& node ) ast->setStatement( body ); //ast->setCondition( condition ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2724,7 +2724,7 @@ bool Parser::parseForStatement( StatementAST::Node& node ) // ast->setExpression( expression ); ast->setStatement( body ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2773,7 +2773,7 @@ bool Parser::parseCompoundStatement( StatementAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2817,7 +2817,7 @@ bool Parser::parseIfStatement( StatementAST::Node& node ) } UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2847,7 +2847,7 @@ bool Parser::parseSwitchStatement( StatementAST::Node& node ) ast->setCondition( cond ); ast->setStatement( stmt ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2864,7 +2864,7 @@ bool Parser::parseLabeledStatement( StatementAST::Node& node ) StatementAST::Node stmt; if( parseStatement(stmt) ){ - node = stmt; + node = std::move(stmt); return true; } } @@ -2888,7 +2888,7 @@ bool Parser::parseLabeledStatement( StatementAST::Node& node ) StatementAST::Node stmt; if( parseStatement(stmt) ){ - node = stmt; + node = std::move(stmt); return true; } } @@ -2945,7 +2945,7 @@ bool Parser::parseBlockDeclaration( DeclarationAST::Node& node ) ast->setTypeSpec( spec ); ast->setInitDeclaratorList( declarators ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -2985,7 +2985,7 @@ bool Parser::parseDeclarationStatement( StatementAST::Node& node ) DeclarationStatementAST::Node ast = CreateNode<DeclarationStatementAST>(); ast->setDeclaration( decl ); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); //kdDebug(9007)<< "---------------------> found a block declaration" << endl; return true; @@ -3049,7 +3049,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node, TQString& com SimpleDeclarationAST::Node ast = CreateNode<SimpleDeclarationAST>(); ast->setInitDeclaratorList( declarators ); ast->setText( toString(start, endSignature) ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; @@ -3067,7 +3067,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node, TQString& com ast->setInitDeclarator( declarator ); ast->setFunctionBody( funBody ); ast->setText( toString(start, endSignature) ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3084,7 +3084,7 @@ bool Parser::parseDeclarationInternal( DeclarationAST::Node& node, TQString& com ast->setInitDeclarator( declarator ); ast->setText( toString(start, endSignature) ); ast->setFunctionBody( funBody ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3114,7 +3114,7 @@ start_decl: if( parseInitDeclaratorList(declarators) ){ ADVANCE( ';', ";" ); DeclarationAST::Node ast = CreateNode<DeclarationAST>(); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3159,7 +3159,7 @@ start_decl: ast->setTypeSpec( spec ); ast->setWinDeclSpec( winDeclSpec ); ast->setInitDeclaratorList( declarators ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); } return true; @@ -3180,7 +3180,7 @@ start_decl: ast->setTypeSpec( spec ); ast->setFunctionBody( funBody ); ast->setInitDeclarator( decl ); - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } @@ -3226,7 +3226,7 @@ bool Parser::parseFunctionBody( StatementListAST::Node& node ) lex->nextToken(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3291,7 +3291,7 @@ bool Parser::parseTryBlockStatement( StatementAST::Node& node ) } } - node = stmt; + node = std::move(stmt); return true; } @@ -3816,7 +3816,7 @@ bool Parser::parseLogicalOrExpression( AST::Node& node, bool templArgs ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3861,7 +3861,7 @@ bool Parser::parseAssignmentExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3872,7 +3872,7 @@ bool Parser::parseConstantExpression( AST::Node& node ) if( parseConditionalExpression(node) ){ AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } return false; @@ -3889,7 +3889,7 @@ bool Parser::parseExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -3915,7 +3915,7 @@ bool Parser::parseCommaExpression( AST::Node& node ) AST::Node ast = CreateNode<AST>(); UPDATE_POS( ast, start, lex->index() ); - node = ast; + node = std::move(ast); return true; } @@ -4120,7 +4120,7 @@ bool Parser::parseIdentifierList( GroupAST::Node & node ) ADVANCE( Token_identifier, "identifier" ); } - node = ast; + node = std::move(ast); UPDATE_POS( node, start, lex->index() ); return true; } diff --git a/umbrello/umbrello/codeoperation.cpp b/umbrello/umbrello/codeoperation.cpp index 13f5121b..da403739 100644 --- a/umbrello/umbrello/codeoperation.cpp +++ b/umbrello/umbrello/codeoperation.cpp @@ -163,7 +163,7 @@ void CodeOperation::init (UMLOperation * parentOp) setTag(CodeOperation::findTag(parentOp)); // not needed.. done by parent "ownedcodeblock" class - // connect(parentOp,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + // connect(parentOp,TQ_SIGNAL(modified()),this,TQ_SLOT(syncToParent())); } diff --git a/umbrello/umbrello/codeparameter.cpp b/umbrello/umbrello/codeparameter.cpp index cd10e438..f6dc9d48 100644 --- a/umbrello/umbrello/codeparameter.cpp +++ b/umbrello/umbrello/codeparameter.cpp @@ -281,7 +281,7 @@ void CodeParameter::initFields ( ClassifierCodeDocument * doc, UMLObject * obj) m_comment = CodeGenFactory::newCodeComment(m_parentDocument); m_comment->setText(getParentObject()->getDoc()); - connect(m_parentObject,TQT_SIGNAL(modified()),this,TQT_SLOT(syncToParent())); + connect(m_parentObject,TQ_SIGNAL(modified()),this,TQ_SLOT(syncToParent())); } #include "codeparameter.moc" diff --git a/umbrello/umbrello/dialogs/activitypage.cpp b/umbrello/umbrello/dialogs/activitypage.cpp index 9262949e..92f8f60a 100644 --- a/umbrello/umbrello/dialogs/activitypage.cpp +++ b/umbrello/umbrello/dialogs/activitypage.cpp @@ -69,10 +69,10 @@ void ActivityPage::setupPage() { KButtonBox* buttonBox = new KButtonBox(m_pActivityGB); - buttonBox->addButton( i18n("New Activity..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewActivity()) ); + buttonBox->addButton( i18n("New Activity..."), this, TQ_SLOT(slotNewActivity()) ); m_pDeleteActivityButton = buttonBox->addButton( i18n("Delete"), - TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) ); - m_pRenameButton = buttonBox->addButton( i18n("Rename"), TQT_TQOBJECT(this), TQT_SLOT(slotRename()) ); + this, TQ_SLOT(slotDelete()) ); + m_pRenameButton = buttonBox->addButton( i18n("Rename"), this, TQ_SLOT(slotRename()) ); listVBoxLayout->addWidget(buttonBox); mainLayout -> addWidget( m_pActivityGB ); @@ -86,19 +86,19 @@ void ActivityPage::setupPage() { } //now setup the signals - connect(m_pActivityLB, TQT_SIGNAL(clicked(TQListBoxItem *)), this, TQT_SLOT(slotClicked(TQListBoxItem *))); - connect(m_pActivityLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); + connect(m_pActivityLB, TQ_SIGNAL(clicked(TQListBoxItem *)), this, TQ_SLOT(slotClicked(TQListBoxItem *))); + connect(m_pActivityLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pActivityLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); + connect(m_pActivityLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); - connect( m_pTopArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTopClicked() ) ); - connect( m_pUpArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); - connect( m_pDownArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); - connect( m_pBottomArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBottomClicked() ) ); + connect( m_pTopArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTopClicked() ) ); + connect( m_pUpArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) ); + connect( m_pDownArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) ); + connect( m_pBottomArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBottomClicked() ) ); - connect( m_pActivityLB, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), this, TQT_SLOT( slotDoubleClicked( TQListBoxItem* ) ) ); + connect( m_pActivityLB, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), this, TQ_SLOT( slotDoubleClicked( TQListBoxItem* ) ) ); enableWidgets(false); } @@ -160,7 +160,7 @@ void ActivityPage::slotRename() { void ActivityPage::slotRightButtonClicked(TQListBoxItem * /*item*/, const TQPoint &/* p*/) { if(m_pMenu) { m_pMenu->hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } @@ -177,13 +177,13 @@ void ActivityPage::slotRightButtonPressed(TQListBoxItem * item, const TQPoint & if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, type); m_pMenu->popup(p); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); } diff --git a/umbrello/umbrello/dialogs/assocpage.cpp b/umbrello/umbrello/dialogs/assocpage.cpp index 63617a7d..6950998f 100644 --- a/umbrello/umbrello/dialogs/assocpage.cpp +++ b/umbrello/umbrello/dialogs/assocpage.cpp @@ -35,25 +35,25 @@ AssocPage::AssocPage(TQWidget *parent, UMLView * v, UMLObject * o) : TQWidget(pa fillListBox(); m_pMenu = 0; - connect(m_pAssocLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); + connect(m_pAssocLB, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQ_SLOT(slotDoubleClick(TQListBoxItem *))); - connect(m_pAssocLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); + connect(m_pAssocLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pAssocLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); + connect(m_pAssocLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } AssocPage::~AssocPage() { - disconnect(m_pAssocLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); + disconnect(m_pAssocLB, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQ_SLOT(slotDoubleClick(TQListBoxItem *))); - disconnect(m_pAssocLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); + disconnect(m_pAssocLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - disconnect(m_pAssocLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); + disconnect(m_pAssocLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } void AssocPage::slotDoubleClick(TQListBoxItem * i) { @@ -87,7 +87,7 @@ void AssocPage::fillListBox() { void AssocPage::slotRightButtonClicked(TQListBoxItem */* item*/, const TQPoint &/* p*/) { if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } @@ -98,13 +98,13 @@ void AssocPage::slotRightButtonPressed(TQListBoxItem * item, const TQPoint & p) return; if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, ListPopupMenu::mt_Association_Selected); m_pMenu->popup(p); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); } void AssocPage::slotPopupMenuSel(int id) { diff --git a/umbrello/umbrello/dialogs/classgenpage.cpp b/umbrello/umbrello/dialogs/classgenpage.cpp index 145148a5..fb881a91 100644 --- a/umbrello/umbrello/dialogs/classgenpage.cpp +++ b/umbrello/umbrello/dialogs/classgenpage.cpp @@ -298,7 +298,7 @@ ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, ObjectWidget* o) : TQWid docLayout -> addWidget(m_pDoc); m_pObject = 0;//needs to be set to zero if( m_pMultiCB ) - connect( m_pDrawActorCB, TQT_SIGNAL( toggled( bool ) ), this, TQT_SLOT( slotActorToggled( bool ) ) ); + connect( m_pDrawActorCB, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotActorToggled( bool ) ) ); } ClassGenPage::ClassGenPage(UMLDoc* d, TQWidget* parent, UMLWidget* widget) : TQWidget(parent) { diff --git a/umbrello/umbrello/dialogs/classifierlistpage.cpp b/umbrello/umbrello/dialogs/classifierlistpage.cpp index b4028f18..952a517a 100644 --- a/umbrello/umbrello/dialogs/classifierlistpage.cpp +++ b/umbrello/umbrello/dialogs/classifierlistpage.cpp @@ -95,10 +95,10 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi //the action buttons KButtonBox* buttonBox = new KButtonBox(m_pItemListGB); - buttonBox->addButton( newItemType, TQT_TQOBJECT(this), TQT_SLOT(slotNewListItem()) ); + buttonBox->addButton( newItemType, this, TQ_SLOT(slotNewListItem()) ); m_pDeleteListItemButton = buttonBox->addButton( i18n("&Delete"), - TQT_TQOBJECT(this), TQT_SLOT(slotDelete()) ); - m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this), TQT_SLOT(slotProperties()) ); + this, TQ_SLOT(slotDelete()) ); + m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, TQ_SLOT(slotProperties()) ); listVBoxLayout->addWidget(buttonBox); mainLayout->addWidget(m_pItemListGB); @@ -117,27 +117,27 @@ ClassifierListPage::ClassifierListPage(TQWidget* parent, UMLClassifier* classifi // to the ListItemModified slot in this class for (UMLClassifierListItem* listItem = itemList.first(); listItem != 0; listItem = itemList.next() ) { m_pItemListLB->insertItem(listItem->toString(Uml::st_SigNoVis)); - connect( listItem, TQT_SIGNAL(modified()),this,TQT_SLOT(slotListItemModified()) ); + connect( listItem, TQ_SIGNAL(modified()),this,TQ_SLOT(slotListItemModified()) ); } enableWidgets(false);//disable widgets until an att is chosen m_pOldListItem = 0; - connect(m_pItemListLB, TQT_SIGNAL(clicked(TQListBoxItem*)), this, TQT_SLOT(slotClicked(TQListBoxItem*))); - connect(m_pItemListLB, TQT_SIGNAL(selectionChanged(TQListBoxItem*)), this, TQT_SLOT(slotClicked(TQListBoxItem*))); - - connect(m_pItemListLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem*, const TQPoint&))); - - connect(m_pItemListLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem*, const TQPoint&))); - connect(m_pDoc, TQT_SIGNAL(sigObjectCreated(UMLObject*)), this, TQT_SLOT(slotListItemCreated(UMLObject*))); - - connect( m_pTopArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotTopClicked() ) ); - connect( m_pUpArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotUpClicked() ) ); - connect( m_pDownArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotDownClicked() ) ); - connect( m_pBottomArrowB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotBottomClicked() ) ); - connect( m_pItemListLB, TQT_SIGNAL( doubleClicked( TQListBoxItem* ) ), - this, TQT_SLOT( slotDoubleClick( TQListBoxItem* ) ) ); + connect(m_pItemListLB, TQ_SIGNAL(clicked(TQListBoxItem*)), this, TQ_SLOT(slotClicked(TQListBoxItem*))); + connect(m_pItemListLB, TQ_SIGNAL(selectionChanged(TQListBoxItem*)), this, TQ_SLOT(slotClicked(TQListBoxItem*))); + + connect(m_pItemListLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem*, const TQPoint&))); + + connect(m_pItemListLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem*, const TQPoint&)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem*, const TQPoint&))); + connect(m_pDoc, TQ_SIGNAL(sigObjectCreated(UMLObject*)), this, TQ_SLOT(slotListItemCreated(UMLObject*))); + + connect( m_pTopArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTopClicked() ) ); + connect( m_pUpArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotUpClicked() ) ); + connect( m_pDownArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotDownClicked() ) ); + connect( m_pBottomArrowB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotBottomClicked() ) ); + connect( m_pItemListLB, TQ_SIGNAL( doubleClicked( TQListBoxItem* ) ), + this, TQ_SLOT( slotDoubleClick( TQListBoxItem* ) ) ); } ClassifierListPage::~ClassifierListPage() { @@ -270,7 +270,7 @@ void ClassifierListPage::slotListItemModified() { void ClassifierListPage::slotRightButtonClicked(TQListBoxItem* /*item*/, const TQPoint& /* p*/) { if (m_pMenu) { m_pMenu->hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } @@ -309,14 +309,14 @@ void ClassifierListPage::slotRightButtonPressed(TQListBoxItem* item, const TQPoi } if(m_pMenu) { m_pMenu->hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, type); m_pMenu->popup(p); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); } void ClassifierListPage::slotPopupMenuSel(int id) { @@ -578,7 +578,7 @@ bool ClassifierListPage::takeItem(UMLClassifierListItem* listItem, int wasAtIndex = m_pClassifier->takeItem(listItem); if (wasAtIndex == -1) return false; - kapp->processEvents(); + tdeApp->processEvents(); peerIndex = -1; UMLObject *o; const Uml::Object_Type seekType = listItem->getBaseType(); diff --git a/umbrello/umbrello/dialogs/codeeditor.cpp b/umbrello/umbrello/dialogs/codeeditor.cpp index 2bae53d0..ce14dba3 100644 --- a/umbrello/umbrello/dialogs/codeeditor.cpp +++ b/umbrello/umbrello/dialogs/codeeditor.cpp @@ -668,26 +668,26 @@ TQPopupMenu * CodeEditor::createPopupMenu ( const TQPoint & pos ) if (m_selectedTextBlock) { if(tb->getWriteOutText()) - menu->insertItem("Hide",this,TQT_SLOT(slotChangeSelectedBlockView()), Key_H, 0); + menu->insertItem("Hide",this,TQ_SLOT(slotChangeSelectedBlockView()), Key_H, 0); else - menu->insertItem("Show",this,TQT_SLOT(slotChangeSelectedBlockView()), Key_S, 0); + menu->insertItem("Show",this,TQ_SLOT(slotChangeSelectedBlockView()), Key_S, 0); CodeBlockWithComments * cb = dynamic_cast<CodeBlockWithComments*>(tb); if(cb) if(cb->getComment()->getWriteOutText()) - menu->insertItem("Hide Comment",this,TQT_SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_H, 1); + menu->insertItem("Hide Comment",this,TQ_SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_H, 1); else - menu->insertItem("Show Comment",this,TQT_SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_S, 1); + menu->insertItem("Show Comment",this,TQ_SLOT(slotChangeSelectedBlockCommentView()), CTRL+Key_S, 1); menu->insertSeparator(); - menu->insertItem("Insert Code Block Before",this,TQT_SLOT(slotInsertCodeBlockBeforeSelected()), CTRL+Key_B, 2); - menu->insertItem("Insert Code Block After",this,TQT_SLOT(slotInsertCodeBlockAfterSelected()), CTRL+Key_A, 3); + menu->insertItem("Insert Code Block Before",this,TQ_SLOT(slotInsertCodeBlockBeforeSelected()), CTRL+Key_B, 2); + menu->insertItem("Insert Code Block After",this,TQ_SLOT(slotInsertCodeBlockAfterSelected()), CTRL+Key_A, 3); menu->insertSeparator(); - menu->insertItem("Copy",this,TQT_SLOT(slotCopyTextBlock()), CTRL+Key_C, 4); - menu->insertItem("Paste",this,TQT_SLOT(slotPasteTextBlock()), CTRL+Key_V, 5); - menu->insertItem("Cut",this,TQT_SLOT(slotCutTextBlock()), CTRL+Key_X, 6); + menu->insertItem("Copy",this,TQ_SLOT(slotCopyTextBlock()), CTRL+Key_C, 4); + menu->insertItem("Paste",this,TQ_SLOT(slotPasteTextBlock()), CTRL+Key_V, 5); + menu->insertItem("Cut",this,TQ_SLOT(slotCutTextBlock()), CTRL+Key_X, 6); // enable/disable based on conditions if(m_selectedTextBlock == m_parentDoc->getHeader()) @@ -813,10 +813,10 @@ void CodeEditor::init ( CodeViewerDialog * parentDlg, CodeDocument * parentDoc ) // setMargin(margin); - // connect(this,TQT_SIGNAL(newLinePressed()),this,TQT_SLOT(newLinePressed())); - // connect(this,TQT_SIGNAL(backspacePressed()),this,TQT_SLOT(backspacePressed())); - connect(this,TQT_SIGNAL(doubleClicked(int,int)),this,TQT_SLOT(doubleClicked(int,int))); - connect(this,TQT_SIGNAL(cursorPositionChanged(int,int)),this,TQT_SLOT(cursorPositionChanged(int,int))); + // connect(this,TQ_SIGNAL(newLinePressed()),this,TQ_SLOT(newLinePressed())); + // connect(this,TQ_SIGNAL(backspacePressed()),this,TQ_SLOT(backspacePressed())); + connect(this,TQ_SIGNAL(doubleClicked(int,int)),this,TQ_SLOT(doubleClicked(int,int))); + connect(this,TQ_SIGNAL(cursorPositionChanged(int,int)),this,TQ_SLOT(cursorPositionChanged(int,int))); // do this last loadFromDocument(); diff --git a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui index da39750a..9dc76260 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationoptionsbase.ui @@ -521,10 +521,10 @@ is empty</string> <slot>activeLanguageChanged(int)</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot access="protected">browseClicked()</slot> <slot access="protected">activeLanguageChanged(int id)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">knuminput.h</include> diff --git a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp index 6aff2b8f..38d44465 100644 --- a/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp +++ b/umbrello/umbrello/dialogs/codegenerationoptionspage.cpp @@ -65,7 +65,7 @@ void CodeGenerationOptionsPage::init() m_SelectIndentationTypeBox->setCurrentItem(indentTypeToInteger(policy->getIndentationType())); m_SelectIndentationNumber->setValue(policy->getIndentationAmount()); - connect(this,TQT_SIGNAL(syncCodeDocumentsToParent()),gen,TQT_SLOT(syncCodeToDocument())); + connect(this,TQ_SIGNAL(syncCodeDocumentsToParent()),gen,TQ_SLOT(syncCodeToDocument())); // now insert the language-dependant page, should there be one updateCodeGenerationPolicyTab(); @@ -135,7 +135,7 @@ void CodeGenerationOptionsPage::updateCodeGenerationPolicyTab() { else m_pCodePolicyPage = new DefaultCodeGenPolicyPage(languageOptionsFrame, "codelangpolicypage"); - connect(this,TQT_SIGNAL(applyClicked()),m_pCodePolicyPage,TQT_SLOT(apply())); + connect(this,TQ_SIGNAL(applyClicked()),m_pCodePolicyPage,TQ_SLOT(apply())); } diff --git a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui index 620af610..fe11dc6d 100644 --- a/umbrello/umbrello/dialogs/codegenerationpolicybase.ui +++ b/umbrello/umbrello/dialogs/codegenerationpolicybase.ui @@ -32,8 +32,8 @@ </property> </widget> </widget> -<Q_SLOTS> +<slots> <slot access="protected">apply()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp index 11130864..a4016bd3 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp +++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp @@ -49,7 +49,7 @@ CodeGenerationWizard::CodeGenerationWizard(UMLClassifierList *classList) m_statusList -> setResizeMode(TQListView::AllColumns); m_CodeGenerationOptionsPage = new CodeGenerationOptionsPage(this); - connect( m_CodeGenerationOptionsPage, TQT_SIGNAL(languageChanged()), this, TQT_SLOT(changeLanguage()) ); + connect( m_CodeGenerationOptionsPage, TQ_SIGNAL(languageChanged()), this, TQ_SLOT(changeLanguage()) ); insertPage(m_CodeGenerationOptionsPage, i18n("Code Generation Options"), 1); @@ -68,7 +68,7 @@ CodeGenerationWizard::CodeGenerationWizard(UMLClassifierList *classList) setFinishEnabled(page(2),true); finishButton()->disconnect(); finishButton()->setText(i18n("&Generate")); - connect(finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(generateCode())); + connect(finishButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(generateCode())); if ( TQApplication::reverseLayout() ) { TQPixmap tmpPixmap( *m_addButton->pixmap() ); @@ -105,8 +105,8 @@ void CodeGenerationWizard::generateCode() { cancelButton()->setEnabled(false); - connect( codeGenerator, TQT_SIGNAL(codeGenerated(UMLClassifier*, bool)), - this, TQT_SLOT(classGenerated(UMLClassifier*, bool)) ); + connect( codeGenerator, TQ_SIGNAL(codeGenerated(UMLClassifier*, bool)), + this, TQ_SLOT(classGenerated(UMLClassifier*, bool)) ); UMLClassifierList cList; cList.setAutoDelete(false); @@ -119,7 +119,7 @@ void CodeGenerationWizard::generateCode() { codeGenerator->writeCodeToFile(cList); finishButton()->setText(i18n("Finish")); finishButton()->disconnect(); - connect(finishButton(),TQT_SIGNAL(clicked()),this,TQT_SLOT(accept())); + connect(finishButton(),TQ_SIGNAL(clicked()),this,TQ_SLOT(accept())); } } diff --git a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui index fdd59c2c..fe36e538 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizardbase.ui +++ b/umbrello/umbrello/dialogs/codegenerationwizardbase.ui @@ -300,10 +300,10 @@ for in the right hand side list</string> <forwards> <forward>class UMLClassifier</forward> </forwards> -<Q_SLOTS> +<slots> <slot>selectClass()</slot> <slot access="protected">deselectClass()</slot> <slot>classGenerated( UMLClassifier * /* c */ )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/codeviewerdialog.cpp b/umbrello/umbrello/dialogs/codeviewerdialog.cpp index 37f8f53e..bbe13119 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialog.cpp +++ b/umbrello/umbrello/dialogs/codeviewerdialog.cpp @@ -83,8 +83,8 @@ void CodeViewerDialog::addCodeDocument( CodeDocument * doc) TQString ext = doc->getFileExtension(); m_tabWidget->insertTab(page, (fname + (ext.isEmpty()? "" : ext))); - connect( m_highlightCheckBox, TQT_SIGNAL( stateChanged(int) ), page, TQT_SLOT( changeHighlighting(int) ) ); - connect( m_showHiddenCodeCB, TQT_SIGNAL( stateChanged(int) ), page, TQT_SLOT( changeShowHidden(int) ) ); + connect( m_highlightCheckBox, TQ_SIGNAL( stateChanged(int) ), page, TQ_SLOT( changeHighlighting(int) ) ); + connect( m_showHiddenCodeCB, TQ_SIGNAL( stateChanged(int) ), page, TQ_SLOT( changeShowHidden(int) ) ); } diff --git a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui index 1a283200..cdd46c43 100644 --- a/umbrello/umbrello/dialogs/codeviewerdialogbase.ui +++ b/umbrello/umbrello/dialogs/codeviewerdialogbase.ui @@ -106,8 +106,8 @@ <slot>close()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>changeHighlighting(int)</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/dialogs/diagramprintpage.cpp b/umbrello/umbrello/dialogs/diagramprintpage.cpp index 56390d0c..aba02237 100644 --- a/umbrello/umbrello/dialogs/diagramprintpage.cpp +++ b/umbrello/umbrello/dialogs/diagramprintpage.cpp @@ -85,8 +85,8 @@ DiagramPrintPage::DiagramPrintPage(TQWidget * parent, UMLDoc * m_pDoc) : KPrintD m_ViewType = Uml::dt_Class; - connect(m_pFilterBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotClicked(int))); - connect(m_pTypeCB, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotActivated(const TQString&))); + connect(m_pFilterBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotClicked(int))); + connect(m_pTypeCB, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotActivated(const TQString&))); m_pTypeCB -> insertItem(i18n("Class")); m_pTypeCB -> insertItem(i18n("Use Case")); @@ -100,8 +100,8 @@ DiagramPrintPage::DiagramPrintPage(TQWidget * parent, UMLDoc * m_pDoc) : KPrintD DiagramPrintPage::~DiagramPrintPage() { - disconnect(m_pFilterBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotClicked(int))); - disconnect(m_pTypeCB, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(slotActivated(const TQString&))); + disconnect(m_pFilterBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotClicked(int))); + disconnect(m_pTypeCB, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(slotActivated(const TQString&))); } void DiagramPrintPage::getOptions( TQMap<TQString,TQString>& opts, bool /*incldef = false*/ ) { diff --git a/umbrello/umbrello/dialogs/pkgcontentspage.cpp b/umbrello/umbrello/dialogs/pkgcontentspage.cpp index 84bb95b6..7db17fe3 100644 --- a/umbrello/umbrello/dialogs/pkgcontentspage.cpp +++ b/umbrello/umbrello/dialogs/pkgcontentspage.cpp @@ -39,25 +39,25 @@ PkgContentsPage::PkgContentsPage(TQWidget *parent, UMLPackage *pkg) fillListBox(); m_pMenu = 0; - connect(m_pContentLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); + connect(m_pContentLB, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQ_SLOT(slotDoubleClick(TQListBoxItem *))); - connect(m_pContentLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); + connect(m_pContentLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pContentLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); + connect(m_pContentLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } PkgContentsPage::~PkgContentsPage() { - disconnect(m_pContentLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - this, TQT_SLOT(slotDoubleClick(TQListBoxItem *))); + disconnect(m_pContentLB, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQ_SLOT(slotDoubleClick(TQListBoxItem *))); - disconnect(m_pContentLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); + disconnect(m_pContentLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonPressed(TQListBoxItem *, const TQPoint &))); - disconnect(m_pContentLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); + disconnect(m_pContentLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotRightButtonClicked(TQListBoxItem *, const TQPoint &))); } void PkgContentsPage::slotDoubleClick(TQListBoxItem * i) { @@ -85,7 +85,7 @@ void PkgContentsPage::fillListBox() { void PkgContentsPage::slotRightButtonClicked(TQListBoxItem */* item*/, const TQPoint &/* p*/) { if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } @@ -96,13 +96,13 @@ void PkgContentsPage::slotRightButtonPressed(TQListBoxItem * item, const TQPoint return; if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, ListPopupMenu::mt_Association_Selected); m_pMenu->popup(p); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPopupMenuSel(int))); } void PkgContentsPage::slotPopupMenuSel(int id) { diff --git a/umbrello/umbrello/dialogs/selectopdlg.cpp b/umbrello/umbrello/dialogs/selectopdlg.cpp index 03aaed56..9fc94cf8 100644 --- a/umbrello/umbrello/dialogs/selectopdlg.cpp +++ b/umbrello/umbrello/dialogs/selectopdlg.cpp @@ -68,13 +68,13 @@ SelectOpDlg::SelectOpDlg(UMLView * parent, UMLClassifier * c) insertOperation( obj->toString(Uml::st_SigNoVis) ); } //disableResize(); - connect(m_pOpBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSelected(int))); + connect(m_pOpBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotSelected(int))); m_nOpCount = c -> operations(); slotSelected(OP); } SelectOpDlg::~SelectOpDlg() { - disconnect(m_pOpBG, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(slotSelected(int))); + disconnect(m_pOpBG, TQ_SIGNAL(clicked(int)), this, TQ_SLOT(slotSelected(int))); delete m_pOpBG; } diff --git a/umbrello/umbrello/dialogs/settingsdlg.cpp b/umbrello/umbrello/dialogs/settingsdlg.cpp index 74b37c69..fd9e7995 100644 --- a/umbrello/umbrello/dialogs/settingsdlg.cpp +++ b/umbrello/umbrello/dialogs/settingsdlg.cpp @@ -89,8 +89,8 @@ void SettingsDlg::setupUIPage() { m_UiWidgets.useFillColorCB -> setChecked( m_pOptionState->uiState.useFillColor ); //connect button signals up - connect( m_UiWidgets.lineDefaultB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotLineBClicked()) ); - connect( m_UiWidgets.fillDefaultB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotFillBClicked()) ); + connect( m_UiWidgets.lineDefaultB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotLineBClicked()) ); + connect( m_UiWidgets.fillDefaultB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotFillBClicked()) ); } void SettingsDlg::setupGeneralPage() { @@ -192,7 +192,7 @@ void SettingsDlg::setupGeneralPage() { } m_GeneralWidgets.diagramKB->setCurrentItem( (int)m_pOptionState->generalState.diagram-1 ); - connect( m_GeneralWidgets.autosaveCB, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotAutosaveCBClicked()) ); + connect( m_GeneralWidgets.autosaveCB, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotAutosaveCBClicked()) ); } /** @@ -293,7 +293,7 @@ void SettingsDlg::setupCodeGenPage() { //setup code generation settings page TQVBox * page = addVBoxPage( i18n("Code Generation"), i18n("Code Generation Settings"), DesktopIcon( "source") ); m_pCodeGenPage = new CodeGenerationOptionsPage(page); - connect( m_pCodeGenPage, TQT_SIGNAL(languageChanged()), this, TQT_SLOT(slotApply()) ); + connect( m_pCodeGenPage, TQ_SIGNAL(languageChanged()), this, TQ_SLOT(slotApply()) ); } void SettingsDlg::setupCodeViewerPage(Settings::CodeViewerState options) { diff --git a/umbrello/umbrello/dialogs/umlattributedialog.cpp b/umbrello/umbrello/dialogs/umlattributedialog.cpp index 9adb17a4..6acfa2df 100644 --- a/umbrello/umbrello/dialogs/umlattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlattributedialog.cpp @@ -140,7 +140,7 @@ void UMLAttributeDialog::setupDialog() { } m_pNameLE->setFocus(); - connect( m_pNameLE, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_pNameLE, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotNameChanged( const TQString & ) ) ); slotNameChanged(m_pNameLE->text() ); } diff --git a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp index 39ba3c6e..e035a169 100644 --- a/umbrello/umbrello/dialogs/umlentityattributedialog.cpp +++ b/umbrello/umbrello/dialogs/umlentityattributedialog.cpp @@ -142,7 +142,7 @@ void UMLEntityAttributeDialog::setupDialog() { // Switch to SQL as the active language if no datatypes are set. UMLApp::app()->setActiveLanguage("SQL"); pDoc->addDefaultDatatypes(); - kapp->processEvents(); + tdeApp->processEvents(); dataTypes = pDoc->getDatatypes(); } UMLClassifier *dat; @@ -169,7 +169,7 @@ void UMLEntityAttributeDialog::setupDialog() { } m_pNameLE->setFocus(); - connect( m_pNameLE, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_pNameLE, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotNameChanged( const TQString & ) ) ); slotNameChanged(m_pNameLE->text() ); } diff --git a/umbrello/umbrello/dialogs/umloperationdialog.cpp b/umbrello/umbrello/dialogs/umloperationdialog.cpp index 76b224c0..728ae675 100644 --- a/umbrello/umbrello/dialogs/umloperationdialog.cpp +++ b/umbrello/umbrello/dialogs/umloperationdialog.cpp @@ -138,10 +138,10 @@ void UMLOperationDialog::setupDialog() { buttonLayout->addWidget( m_pDownButton ); KButtonBox* buttonBox = new KButtonBox(m_pParmsGB); - buttonBox->addButton( i18n("Ne&w Parameter..."), TQT_TQOBJECT(this), TQT_SLOT(slotNewParameter()) ); - m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), TQT_TQOBJECT(this), TQT_SLOT(slotDeleteParameter()) ); - m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), TQT_TQOBJECT(this), - TQT_SLOT(slotParameterProperties()) ); + buttonBox->addButton( i18n("Ne&w Parameter..."), this, TQ_SLOT(slotNewParameter()) ); + m_pDeleteButton = buttonBox->addButton( i18n("&Delete"), this, TQ_SLOT(slotDeleteParameter()) ); + m_pPropertiesButton = buttonBox->addButton( i18n("&Properties"), this, + TQ_SLOT(slotParameterProperties()) ); parmsLayout->addWidget(buttonBox); topLayout -> addWidget(m_pParmsGB); @@ -232,24 +232,24 @@ void UMLOperationDialog::setupDialog() { m_pStereoTypeCB->setCurrentItem(-1); //setup parm list box signals - connect( m_pUpButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotParameterUp() ) ); - connect( m_pDownButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotParameterDown() ) ); + connect( m_pUpButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotParameterUp() ) ); + connect( m_pDownButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotParameterDown() ) ); - connect(m_pParmsLB, TQT_SIGNAL(clicked(TQListBoxItem*)), - this, TQT_SLOT(slotParamsBoxClicked(TQListBoxItem*))); + connect(m_pParmsLB, TQ_SIGNAL(clicked(TQListBoxItem*)), + this, TQ_SLOT(slotParamsBoxClicked(TQListBoxItem*))); - connect(m_pParmsLB, TQT_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotParmRightButtonPressed(TQListBoxItem *, const TQPoint &))); + connect(m_pParmsLB, TQ_SIGNAL(rightButtonPressed(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotParmRightButtonPressed(TQListBoxItem *, const TQPoint &))); - connect(m_pParmsLB, TQT_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), - this, TQT_SLOT(slotParmRightButtonClicked(TQListBoxItem *, const TQPoint &))); + connect(m_pParmsLB, TQ_SIGNAL(rightButtonClicked(TQListBoxItem *, const TQPoint &)), + this, TQ_SLOT(slotParmRightButtonClicked(TQListBoxItem *, const TQPoint &))); - connect(m_pParmsLB, TQT_SIGNAL(doubleClicked(TQListBoxItem *)), - this, TQT_SLOT(slotParmDoubleClick(TQListBoxItem *))); + connect(m_pParmsLB, TQ_SIGNAL(doubleClicked(TQListBoxItem *)), + this, TQ_SLOT(slotParmDoubleClick(TQListBoxItem *))); m_pNameLE->setFocus(); - connect( m_pNameLE, TQT_SIGNAL( textChanged ( const TQString & ) ), TQT_SLOT( slotNameChanged( const TQString & ) ) ); + connect( m_pNameLE, TQ_SIGNAL( textChanged ( const TQString & ) ), TQ_SLOT( slotNameChanged( const TQString & ) ) ); slotNameChanged(m_pNameLE->text() ); } @@ -271,20 +271,20 @@ void UMLOperationDialog::slotParmRightButtonPressed(TQListBoxItem *item, const T } if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotParmPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotParmPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } m_pMenu = new ListPopupMenu(this, type); m_pMenu->popup(p); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotParmPopupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotParmPopupMenuSel(int))); } void UMLOperationDialog::slotParmRightButtonClicked(TQListBoxItem */*item*/, const TQPoint &/*p*/) { if(m_pMenu) { m_pMenu -> hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotParmPopupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotParmPopupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } diff --git a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp index 7c1df12d..5ee46782 100644 --- a/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp +++ b/umbrello/umbrello/dialogs/umlwidgetcolorpage.cpp @@ -80,8 +80,8 @@ void UMLWidgetColorPage::init() colorLayout -> addWidget( m_pUseFillColorCB, 2, 0 ); //connect button signals up - connect( m_pLineDefaultB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotLineButtonClicked() )) ; - connect( m_pFillDefaultB, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotFillButtonClicked() ) ); + connect( m_pLineDefaultB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotLineButtonClicked() )) ; + connect( m_pFillDefaultB, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotFillButtonClicked() ) ); } UMLWidgetColorPage::~UMLWidgetColorPage() {} diff --git a/umbrello/umbrello/docgenerators/docbookgenerator.cpp b/umbrello/umbrello/docgenerators/docbookgenerator.cpp index 7f3f8194..79be6dac 100644 --- a/umbrello/umbrello/docgenerators/docbookgenerator.cpp +++ b/umbrello/umbrello/docgenerators/docbookgenerator.cpp @@ -30,7 +30,7 @@ #include <tdetempfile.h> #include <tdemessagebox.h> #include <tdeio/job.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqregexp.h> #include <tqtextstream.h> diff --git a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp index c57dad97..5d81c9bd 100644 --- a/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp +++ b/umbrello/umbrello/docgenerators/xhtmlgenerator.cpp @@ -30,7 +30,7 @@ #include <tdetempfile.h> #include <tdemessagebox.h> #include <tdeio/job.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqfile.h> #include <tqregexp.h> #include <tqtextstream.h> @@ -72,7 +72,7 @@ bool XhtmlGenerator::generateXhtmlForProjectInto(const KURL& destDir) return false; } kDebug() << "Connecting..." << endl; - connect(docbookJob, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotDocbookToXhtml( TDEIO::Job *))); + connect(docbookJob, TQ_SIGNAL(result( TDEIO::Job * )), this, TQ_SLOT(slotDocbookToXhtml( TDEIO::Job *))); return true; } @@ -152,7 +152,7 @@ void XhtmlGenerator::slotDocbookToXhtml(TDEIO::Job * docbookJob) kDebug() << "Copying HTML result to: " << xhtmlUrl << endl; TDEIO::Job* job = TDEIO::file_copy(tmpXhtml.file()->name(),xhtmlUrl,-1,true,false,false); job->setAutoErrorHandlingEnabled(true); - connect (job, TQT_SIGNAL(result( TDEIO::Job* )), this, TQT_SLOT(slotHtmlCopyFinished( TDEIO::Job* ))); + connect (job, TQ_SIGNAL(result( TDEIO::Job* )), this, TQ_SLOT(slotHtmlCopyFinished( TDEIO::Job* ))); TQString cssFileName(TDEGlobal::dirs()->findResource("appdata","xmi.css")); kDebug() << "CSS file is'"<<cssFileName<<"'" << endl; diff --git a/umbrello/umbrello/entity.cpp b/umbrello/umbrello/entity.cpp index 2df53283..09a99572 100644 --- a/umbrello/umbrello/entity.cpp +++ b/umbrello/umbrello/entity.cpp @@ -100,7 +100,7 @@ UMLObject* UMLEntity::addEntityAttribute(const TQString& name, Uml::IDType id) { m_List.append(literal); emit entityAttributeAdded(literal); UMLObject::emitModified(); - connect(literal,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(literal,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return literal; } @@ -112,7 +112,7 @@ bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, IDChangeLog* L m_List.append(attribute); emit entityAttributeAdded(attribute); UMLObject::emitModified(); - connect(attribute,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(attribute,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } else if (Log) { Log->removeChangeByNewID( attribute->getID() ); @@ -133,7 +133,7 @@ bool UMLEntity::addEntityAttribute(UMLEntityAttribute* attribute, int position) } emit entityAttributeAdded(attribute); UMLObject::emitModified(); - connect(attribute,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(attribute,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } return false; @@ -148,7 +148,7 @@ int UMLEntity::removeEntityAttribute(UMLClassifierListItem* literal) { UMLObject::emitModified(); // If we are deleting the object, then we don't need to disconnect..this is done auto-magically // for us by TQObject. -b.t. - // disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + // disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); delete literal; return m_List.count(); } diff --git a/umbrello/umbrello/enum.cpp b/umbrello/umbrello/enum.cpp index 90682d51..fefdf808 100644 --- a/umbrello/umbrello/enum.cpp +++ b/umbrello/umbrello/enum.cpp @@ -102,7 +102,7 @@ UMLObject* UMLEnum::addEnumLiteral(const TQString &name, Uml::IDType id) { m_List.append(literal); UMLObject::emitModified(); emit enumLiteralAdded(literal); - connect(literal,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(literal,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return literal; } @@ -114,7 +114,7 @@ bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, IDChangeLog* Log /* = 0*/) m_List.append(literal); UMLObject::emitModified(); emit enumLiteralAdded(literal); - connect(literal,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(literal,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } else if (Log) { Log->removeChangeByNewID( literal->getID() ); @@ -135,7 +135,7 @@ bool UMLEnum::addEnumLiteral(UMLEnumLiteral* literal, int position) { } UMLObject::emitModified(); emit enumLiteralAdded(literal); - connect(literal,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(literal,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); return true; } return false; @@ -150,7 +150,7 @@ int UMLEnum::removeEnumLiteral(UMLEnumLiteral* literal) { UMLObject::emitModified(); // If we are deleting the object, then we don't need to disconnect..this is done auto-magically // for us by TQObject. -b.t. - // disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + // disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); delete literal; return m_List.count(); } diff --git a/umbrello/umbrello/import_rose.cpp b/umbrello/umbrello/import_rose.cpp index fb9d5a71..41449ac5 100644 --- a/umbrello/umbrello/import_rose.cpp +++ b/umbrello/umbrello/import_rose.cpp @@ -328,7 +328,7 @@ PetalNode *readAttributes(TQStringList initialArgs, TQTextStream& stream) { } else if (nxt == "value" || nxt.startsWith("\"")) { value.string = extractValue(tokens, stream); } else { - kapp->processEvents(); + tdeApp->processEvents(); value.node = readAttributes(tokens, stream); if (value.node == NULL) return NULL; diff --git a/umbrello/umbrello/kplayerslideraction.cpp b/umbrello/umbrello/kplayerslideraction.cpp index 9df37596..d3b40d76 100644 --- a/umbrello/umbrello/kplayerslideraction.cpp +++ b/umbrello/umbrello/kplayerslideraction.cpp @@ -77,7 +77,7 @@ KPlayerPopupSliderAction::KPlayerPopupSliderAction (const TQString& text, m_frame -> resize (36, m_slider -> sizeHint().height() + 4); m_slider -> setGeometry (m_frame -> contentsRect()); //CHANGED kdDebug() << "Popup slider size " << m_slider -> width() << "x" << m_slider -> height() << "\n"; - connect (m_slider, TQT_SIGNAL (changed (int)), receiver, slot); + connect (m_slider, TQ_SIGNAL (changed (int)), receiver, slot); } KPlayerPopupSliderAction::~KPlayerPopupSliderAction() @@ -148,10 +148,10 @@ void KPlayerPopupSliderAction::slotActivated (void) } //CHANGED kdDebug() << "Point: " << point.x() << "x" << point.y() << "\n"; m_frame -> move (point); - /*if ( kapp && kapp -> activeWindow() ) + /*if ( tdeApp && tdeApp -> activeWindow() ) { TQMouseEvent me (TQEvent::MouseButtonRelease, TQPoint(0,0), TQPoint(0,0), TQMouseEvent::LeftButton, TQMouseEvent::NoButton); - TQApplication::sendEvent (kapp -> activeWindow(), &me); + TQApplication::sendEvent (tdeApp -> activeWindow(), &me); }*/ m_frame -> show(); m_slider -> setFocus(); @@ -163,7 +163,7 @@ KPlayerSliderAction::KPlayerSliderAction (const TQString& text, const TDEShortcu //: TDEAction (text, 0, parent, name) { setAutoSized (true); - connect (slider(), TQT_SIGNAL (changed (int)), receiver, slot); + connect (slider(), TQ_SIGNAL (changed (int)), receiver, slot); } KPlayerSliderAction::~KPlayerSliderAction() @@ -180,7 +180,7 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) //Q_ASSERT (widget -> inherits ("TDEToolBar")); //if ( ! widget -> inherits ("TDEToolBar") ) // return -1; - //if ( kapp && ! kapp -> authorizeTDEAction (name()) ) + //if ( tdeApp && ! tdeApp -> authorizeTDEAction (name()) ) // return -1; int result = KWidgetAction::plug (widget, index); if ( result < 0 ) @@ -199,8 +199,8 @@ int KPlayerSliderAction::plug (TQWidget* widget, int index) //addContainer (toolbar, id); //setupToolbar (toolbar -> orientation(), toolbar); orientationChanged (toolbar -> orientation()); - connect (toolbar, TQT_SIGNAL (orientationChanged (TQt::Orientation)), this, TQT_SLOT (orientationChanged (TQt::Orientation))); - //connect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); + connect (toolbar, TQ_SIGNAL (orientationChanged (TQt::Orientation)), this, TQ_SLOT (orientationChanged (TQt::Orientation))); + //connect (toolbar, TQ_SIGNAL (destroyed()), this, TQ_SLOT (toolbarDestroyed())); //if ( parentCollection() ) // parentCollection() -> connectHighlight (toolbar, this); //return containerCount() - 1; @@ -216,8 +216,8 @@ void KPlayerSliderAction::unplug (TQWidget* widget) if ( ! slider() || ! isPlugged() || widget != slider() -> parent() ) return; //TDEToolBar* toolbar = (TDEToolBar*) widget; - disconnect (widget, TQT_SIGNAL (orientationChanged (TQt::Orientation)), this, TQT_SLOT (orientationChanged (TQt::Orientation))); - //disconnect (toolbar, TQT_SIGNAL (destroyed()), this, TQT_SLOT (toolbarDestroyed())); + disconnect (widget, TQ_SIGNAL (orientationChanged (TQt::Orientation)), this, TQ_SLOT (orientationChanged (TQt::Orientation))); + //disconnect (toolbar, TQ_SIGNAL (destroyed()), this, TQ_SLOT (toolbarDestroyed())); //m_slider -> reparent (0, TQPoint()); /*int index = findContainer (toolbar); if ( index == -1 ) @@ -270,7 +270,7 @@ KPlayerSlider::KPlayerSlider (TQt::Orientation orientation, TQWidget* parent, co { m_changing_orientation = false; setTickmarks (TQSlider::Both); - connect (this, TQT_SIGNAL (valueChanged (int)), this, TQT_SLOT (sliderValueChanged (int))); + connect (this, TQ_SIGNAL (valueChanged (int)), this, TQ_SLOT (sliderValueChanged (int))); } KPlayerSlider::~KPlayerSlider() diff --git a/umbrello/umbrello/kstartuplogo.cpp b/umbrello/umbrello/kstartuplogo.cpp index 49d4d0f2..584541c9 100644 --- a/umbrello/umbrello/kstartuplogo.cpp +++ b/umbrello/umbrello/kstartuplogo.cpp @@ -14,7 +14,7 @@ #include "kstartuplogo.h" #include <tdeapplication.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tqtimer.h> TDEStartupLogo::TDEStartupLogo(TQWidget * parent, const char *name) @@ -31,7 +31,7 @@ TDEStartupLogo::TDEStartupLogo(TQWidget * parent, const char *name) pm.width(),pm.height()); timer = new TQTimer(this); - connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timerDone()) ); + connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timerDone()) ); timer->start(2000, true); } diff --git a/umbrello/umbrello/linepath.cpp b/umbrello/umbrello/linepath.cpp index df3f614d..f37e43bf 100644 --- a/umbrello/umbrello/linepath.cpp +++ b/umbrello/umbrello/linepath.cpp @@ -85,8 +85,8 @@ void LinePath::setAssociation(AssociationWidget * association ) { if( getAssocType() == Uml::at_Coll_Message ) setupParallelLine(); UMLView * view = (UMLView *)m_pAssociation -> parent(); - connect( view, TQT_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineColorChanged( Uml::IDType ) ) ); - connect( view, TQT_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineWidthChanged( Uml::IDType ) ) ); + connect( view, TQ_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQ_SLOT( slotLineColorChanged( Uml::IDType ) ) ); + connect( view, TQ_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQ_SLOT( slotLineWidthChanged( Uml::IDType ) ) ); } TQPoint LinePath::getPoint( int pointIndex ) { @@ -849,8 +849,8 @@ void LinePath::cleanup() { if( m_pAssociation ) { UMLView * view = (UMLView *)m_pAssociation -> parent(); if(view) { - disconnect( view, TQT_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineColorChanged( Uml::IDType ) ) ); - disconnect( view, TQT_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQT_SLOT( slotLineWidthChanged( Uml::IDType ) ) ); + disconnect( view, TQ_SIGNAL( sigColorChanged( Uml::IDType ) ), this, TQ_SLOT( slotLineColorChanged( Uml::IDType ) ) ); + disconnect( view, TQ_SIGNAL( sigLineWidthChanged( Uml::IDType ) ), this, TQ_SLOT( slotLineWidthChanged( Uml::IDType ) ) ); } m_pAssociation = NULL; } diff --git a/umbrello/umbrello/listpopupmenu.cpp b/umbrello/umbrello/listpopupmenu.cpp index dedf4352..15294ada 100644 --- a/umbrello/umbrello/listpopupmenu.cpp +++ b/umbrello/umbrello/listpopupmenu.cpp @@ -13,7 +13,7 @@ #include "listpopupmenu.h" // qt/kde includes -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdelocale.h> #include <kdebug.h> @@ -249,11 +249,11 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, } if(m_pInsert) - connect(m_pInsert, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pInsert, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pShow) - connect(m_pShow, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pShow, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pColor) - connect(m_pColor, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pColor, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); return; } @@ -437,11 +437,11 @@ ListPopupMenu::ListPopupMenu(TQWidget * parent, UMLWidget * object, }//end switch if(m_pInsert) - connect(m_pInsert, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pInsert, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pShow) - connect(m_pShow, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pShow, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pColor) - connect(m_pColor, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pColor, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); bool bCutState = UMLApp::app() -> getCutCopyState(); setItemEnabled( mt_Cut, bCutState ); @@ -1321,11 +1321,11 @@ void ListPopupMenu::setupMenu(Menu_Type type, UMLView* view) { setItemEnabled( mt_Paste, UMLApp::app() -> getPasteState() ); } if(m_pInsert) - connect(m_pInsert, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pInsert, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pShow) - connect(m_pShow, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pShow, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); if(m_pColor) - connect(m_pColor, TQT_SIGNAL(activated(int)), this, TQT_SIGNAL(activated(int))); + connect(m_pColor, TQ_SIGNAL(activated(int)), this, TQ_SIGNAL(activated(int))); } void ListPopupMenu::setupDiagramMenu(UMLView* view) { diff --git a/umbrello/umbrello/main.cpp b/umbrello/umbrello/main.cpp index 24f12f0c..ae015af5 100644 --- a/umbrello/umbrello/main.cpp +++ b/umbrello/umbrello/main.cpp @@ -85,7 +85,7 @@ void initDocument(TDECmdLineArgs *args, TDEConfig* cfg); void exportAllViews(TDECmdLineArgs *args, const QCStringList &exportOpt); extern "C" int flushEvents() { - kapp->processEvents(); + tdeApp->processEvents(); return 0; } @@ -203,6 +203,6 @@ void exportAllViews(TDECmdLineArgs *args, const QCStringList &exportOpt) { // the event is posted so when the QT loop begins it's processed. UMLApp process this event executing // the method it provides for exporting the views. Once all the views were exported, a quit event // is sent and the app finishes without user interaction - kapp->postEvent(UMLApp::app(), new CmdLineExportAllViewsEvent(extension, directory, useFolders)); + tdeApp->postEvent(UMLApp::app(), new CmdLineExportAllViewsEvent(extension, directory, useFolders)); } diff --git a/umbrello/umbrello/messagewidget.cpp b/umbrello/umbrello/messagewidget.cpp index 09906491..a43effda 100644 --- a/umbrello/umbrello/messagewidget.cpp +++ b/umbrello/umbrello/messagewidget.cpp @@ -466,11 +466,11 @@ bool MessageWidget::activate(IDChangeLog * Log /*= 0*/) { TQString messageText = m_pFText->getText(); m_pFText->setVisible( messageText.length() > 1 ); - connect(m_pOw[Uml::A], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType))); - connect(m_pOw[Uml::B], TQT_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQT_SLOT(slotWidgetMoved(Uml::IDType))); + connect(m_pOw[Uml::A], TQ_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQ_SLOT(slotWidgetMoved(Uml::IDType))); + connect(m_pOw[Uml::B], TQ_SIGNAL(sigWidgetMoved(Uml::IDType)), this, TQ_SLOT(slotWidgetMoved(Uml::IDType))); - connect(this, TQT_SIGNAL(sigMessageMoved()), m_pOw[Uml::A], TQT_SLOT(slotMessageMoved()) ); - connect(this, TQT_SIGNAL(sigMessageMoved()), m_pOw[Uml::B], TQT_SLOT(slotMessageMoved()) ); + connect(this, TQ_SIGNAL(sigMessageMoved()), m_pOw[Uml::A], TQ_SLOT(slotMessageMoved()) ); + connect(this, TQ_SIGNAL(sigMessageMoved()), m_pOw[Uml::B], TQ_SLOT(slotMessageMoved()) ); m_pOw[Uml::A] -> messageAdded(this); m_pOw[Uml::B] -> messageAdded(this); calculateDimensions(); @@ -523,10 +523,10 @@ UMLOperation *MessageWidget::getOperation() { void MessageWidget::setOperation(UMLOperation *op) { if (m_pObject && m_pFText) - disconnect(m_pObject, TQT_SIGNAL(modified()), m_pFText, TQT_SLOT(setMessageText())); + disconnect(m_pObject, TQ_SIGNAL(modified()), m_pFText, TQ_SLOT(setMessageText())); m_pObject = op; if (m_pObject && m_pFText) - connect(m_pObject, TQT_SIGNAL(modified()), m_pFText, TQT_SLOT(setMessageText())); + connect(m_pObject, TQ_SIGNAL(modified()), m_pFText, TQ_SLOT(setMessageText())); } TQString MessageWidget::getCustomOpText() { @@ -661,11 +661,11 @@ void MessageWidget::calculateDimensionsCreation() { void MessageWidget::cleanup() { if (m_pOw[Uml::A]) { - disconnect(this, TQT_SIGNAL(sigMessageMoved()), m_pOw[Uml::A], TQT_SLOT(slotMessageMoved()) ); + disconnect(this, TQ_SIGNAL(sigMessageMoved()), m_pOw[Uml::A], TQ_SLOT(slotMessageMoved()) ); m_pOw[Uml::A]->messageRemoved(this); } if (m_pOw[Uml::B]) { - disconnect(this, TQT_SIGNAL(sigMessageMoved()), m_pOw[Uml::B], TQT_SLOT(slotMessageMoved()) ); + disconnect(this, TQ_SIGNAL(sigMessageMoved()), m_pOw[Uml::B], TQ_SLOT(slotMessageMoved()) ); m_pOw[Uml::B]->messageRemoved(this); } diff --git a/umbrello/umbrello/notewidget.cpp b/umbrello/umbrello/notewidget.cpp index 29ba1906..e2124fb1 100644 --- a/umbrello/umbrello/notewidget.cpp +++ b/umbrello/umbrello/notewidget.cpp @@ -45,8 +45,8 @@ NoteWidget::NoteWidget(UMLView * view, Uml::IDType id) m_pEditor->setTextFormat(TQt::RichText); m_pEditor->setShown(true); setEditorGeometry(); - connect(m_pView, TQT_SIGNAL(contentsMoving(int, int)), - this, TQT_SLOT(slotViewScrolled(int, int))); + connect(m_pView, TQ_SIGNAL(contentsMoving(int, int)), + this, TQ_SLOT(slotViewScrolled(int, int))); #endif } diff --git a/umbrello/umbrello/object_factory.cpp b/umbrello/umbrello/object_factory.cpp index 5fc80b1a..260c72d3 100644 --- a/umbrello/umbrello/object_factory.cpp +++ b/umbrello/umbrello/object_factory.cpp @@ -118,7 +118,7 @@ UMLObject* createNewUMLObject(Uml::Object_Type type, const TQString &name, UMLDoc *doc = UMLApp::app()->getDocument(); parentPkg->addObject(o); doc->signalUMLObjectCreated(o); - kapp->processEvents(); + tdeApp->processEvents(); return o; } diff --git a/umbrello/umbrello/operation.cpp b/umbrello/umbrello/operation.cpp index 18b1b3ba..563c67be 100644 --- a/umbrello/umbrello/operation.cpp +++ b/umbrello/umbrello/operation.cpp @@ -63,7 +63,7 @@ void UMLOperation::moveParmLeft(UMLAttribute * a) { } kDebug() << "UMLOperation::moveParmLeft(" << a->getName() << ") called" << endl; - disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); int idx; if ( (idx=m_List.find( a )) == -1 ) { kDebug() << "Error move parm left " << a->getName() << endl; @@ -83,7 +83,7 @@ void UMLOperation::moveParmRight(UMLAttribute * a) { } kDebug() << "UMLOperation::moveParmRight(" << a->getName() << ") called" << endl; - disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); int idx; if ( (idx=m_List.find( a )) == -1 ) { kDebug() << "Error move parm right " << a->getName() << endl; @@ -104,7 +104,7 @@ void UMLOperation::removeParm(UMLAttribute * a, bool emitModifiedSignal /* =true } kDebug() << "UMLOperation::removeParm(" << a->getName() << ") called" << endl; - disconnect(a,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + disconnect(a,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); if(!m_List.remove(a)) kDebug() << "Error removing parm " << a->getName() << endl; @@ -178,7 +178,7 @@ void UMLOperation::addParm(UMLAttribute *parameter, int position) { else m_List.append( parameter ); UMLObject::emitModified(); - connect(parameter,TQT_SIGNAL(modified()),this,TQT_SIGNAL(modified())); + connect(parameter,TQ_SIGNAL(modified()),this,TQ_SIGNAL(modified())); } TQString UMLOperation::getUniqueParameterName() { diff --git a/umbrello/umbrello/ownedcodeblock.cpp b/umbrello/umbrello/ownedcodeblock.cpp index f80fd315..d26ac6f1 100644 --- a/umbrello/umbrello/ownedcodeblock.cpp +++ b/umbrello/umbrello/ownedcodeblock.cpp @@ -168,7 +168,7 @@ void OwnedCodeBlock::initFields(UMLObject * parent ) // this code block and the parent UMLObject..when the parent // signals a change has been made, we automatically update // ourselves - connect(m_parentObject, TQT_SIGNAL(modified()), this, TQT_SLOT(syncToParent())); + connect(m_parentObject, TQ_SIGNAL(modified()), this, TQ_SLOT(syncToParent())); } /** diff --git a/umbrello/umbrello/plugin.cpp b/umbrello/umbrello/plugin.cpp index 4dfca79c..7a9fcea3 100644 --- a/umbrello/umbrello/plugin.cpp +++ b/umbrello/umbrello/plugin.cpp @@ -150,7 +150,7 @@ Plugin::configure() loadPlugins(conf, "Load"); // only load GUI plugins if this is not a terminal app - if(TDEApplication::kApplication()->type() != TQApplication::Tty) { + if(tdeApp->type() != TQApplication::Tty) { loadPlugins(conf, "LoadGUI"); } } diff --git a/umbrello/umbrello/plugin.h b/umbrello/umbrello/plugin.h index 2b731f08..923c8a6c 100644 --- a/umbrello/umbrello/plugin.h +++ b/umbrello/umbrello/plugin.h @@ -47,7 +47,7 @@ class TDEConfig; * as the parameter. */ #define UMBRELLO_EXPORT_PLUGIN_FACTORY(libname, factory) \ - extern "C" { KDE_EXPORT void *init_##libname() { return new factory(#libname); } } + extern "C" { TDE_EXPORT void *init_##libname() { return new factory(#libname); } } namespace Umbrello { diff --git a/umbrello/umbrello/pluginloader.cpp b/umbrello/umbrello/pluginloader.cpp index eb3fd1e0..88fe47cd 100644 --- a/umbrello/umbrello/pluginloader.cpp +++ b/umbrello/umbrello/pluginloader.cpp @@ -117,7 +117,7 @@ PluginLoader::loadPlugin(const TQString &name) // reference to it if(success) { plugin->ref(); - connect(plugin, TQT_SIGNAL(destroyed(TQObject *)), TQT_SLOT(slotDestroyed(TQObject *))); + connect(plugin, TQ_SIGNAL(destroyed(TQObject *)), TQ_SLOT(slotDestroyed(TQObject *))); } return plugin; diff --git a/umbrello/umbrello/refactoring/refactoringassistant.cpp b/umbrello/umbrello/refactoring/refactoringassistant.cpp index bd55cf5d..3d4e4ca9 100644 --- a/umbrello/umbrello/refactoring/refactoringassistant.cpp +++ b/umbrello/umbrello/refactoring/refactoringassistant.cpp @@ -26,7 +26,7 @@ #include <tqpopupmenu.h> #include <typeinfo> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kiconloader.h> #include <tdelocale.h> #include <tdemessagebox.h> @@ -56,9 +56,9 @@ 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(TDEListView*, TQListViewItem*, const TQPoint&)), - this,TQT_SLOT(showContextMenu(TDEListView*,TQListViewItem*,const TQPoint&))); + connect(this,TQ_SIGNAL(doubleClicked(TQListViewItem*)),this,TQ_SLOT(itemExecuted(TQListViewItem*))); + connect(this,TQ_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this,TQ_SLOT(showContextMenu(TDEListView*,TQListViewItem*,const TQPoint&))); resize(300,400); @@ -177,7 +177,7 @@ void RefactoringAssistant::operationAdded( UMLClassifierListItem *o ) { item = new TDEListViewItem( folder, op->getName() ); m_umlObjectMap[item] = op; - connect( op, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); + connect( op, TQ_SIGNAL( modified() ), this, TQ_SLOT( umlObjectModified() ) ); setVisibilityIcon( item, op ); break; } @@ -192,7 +192,7 @@ void RefactoringAssistant::operationRemoved( UMLClassifierListItem *o ) { return; } - disconnect( op, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); + disconnect( op, TQ_SIGNAL( modified() ), this, TQ_SLOT( umlObjectModified() ) ); m_umlObjectMap.erase(item); delete item; } @@ -219,7 +219,7 @@ void RefactoringAssistant::attributeAdded( UMLClassifierListItem *a ) { item = new TDEListViewItem( folder, att->getName() ); m_umlObjectMap[item] = att; - connect( att, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); + connect( att, TQ_SIGNAL( modified() ), this, TQ_SLOT( umlObjectModified() ) ); setVisibilityIcon( item, att ); break; } @@ -234,7 +234,7 @@ void RefactoringAssistant::attributeRemoved( UMLClassifierListItem *a ) { return; } - disconnect( att, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); + disconnect( att, TQ_SIGNAL( modified() ), this, TQ_SLOT( umlObjectModified() ) ); m_umlObjectMap.erase(item); delete item; } @@ -286,17 +286,17 @@ void RefactoringAssistant::showContextMenu(TDEListView* ,TQListViewItem *item, c Uml::Object_Type t = obj->getBaseType(); if (t == Uml::ot_Class) { - m_menu->insertItem(i18n("Add Base Class"),this,TQT_SLOT(addBaseClassifier())); - m_menu->insertItem(i18n("Add Derived Class"),this,TQT_SLOT(addDerivedClassifier())); - // m_menu->insertItem(i18n("Add Interface Implementation"),this,TQT_SLOT(addInterfaceImplementation())); - m_menu->insertItem(i18n("Add Operation"),this,TQT_SLOT(createOperation())); - m_menu->insertItem(i18n("Add Attribute"),this,TQT_SLOT(createAttribute())); + m_menu->insertItem(i18n("Add Base Class"),this,TQ_SLOT(addBaseClassifier())); + m_menu->insertItem(i18n("Add Derived Class"),this,TQ_SLOT(addDerivedClassifier())); + // m_menu->insertItem(i18n("Add Interface Implementation"),this,TQ_SLOT(addInterfaceImplementation())); + m_menu->insertItem(i18n("Add Operation"),this,TQ_SLOT(createOperation())); + m_menu->insertItem(i18n("Add Attribute"),this,TQ_SLOT(createAttribute())); } else if (t == Uml::ot_Interface) { - m_menu->insertItem(i18n("Add Base Interface"),this,TQT_SLOT(addSuperClassifier())); - m_menu->insertItem(i18n("Add Derived Interface"),this,TQT_SLOT(addDerivedClassifier())); - m_menu->insertItem(i18n("Add Operation"),this,TQT_SLOT(createOperation())); + m_menu->insertItem(i18n("Add Base Interface"),this,TQ_SLOT(addSuperClassifier())); + m_menu->insertItem(i18n("Add Derived Interface"),this,TQ_SLOT(addDerivedClassifier())); + m_menu->insertItem(i18n("Add Operation"),this,TQ_SLOT(createOperation())); } // else // { @@ -304,17 +304,17 @@ void RefactoringAssistant::showContextMenu(TDEListView* ,TQListViewItem *item, c // return; // } m_menu->insertSeparator(); - m_menu->insertItem(i18n("Properties"),this,TQT_SLOT(editProperties())); + m_menu->insertItem(i18n("Properties"),this,TQ_SLOT(editProperties())); } else {//menu for other ViewItems if( item->text(1) == "operations" ) { - m_menu->insertItem(i18n("Add Operation"),this,TQT_SLOT(createOperation())); + m_menu->insertItem(i18n("Add Operation"),this,TQ_SLOT(createOperation())); } else if( item->text(1) == "attributes" ) { - m_menu->insertItem(i18n("Add Attribute"),this,TQT_SLOT(createAttribute())); + m_menu->insertItem(i18n("Add Attribute"),this,TQ_SLOT(createAttribute())); } else { @@ -469,15 +469,15 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI m_umlObjectMap[classifierItem] = classifier; } - connect( classifier, TQT_SIGNAL( modified() ), this, TQT_SLOT( umlObjectModified() ) ); + connect( classifier, TQ_SIGNAL( modified() ), this, TQ_SLOT( umlObjectModified() ) ); UMLClassifier *klass = dynamic_cast<UMLClassifier*>(classifier); if( klass ) {// only Classes have attributes... - connect( classifier, TQT_SIGNAL(attributeAdded(UMLClassifierListItem*)), - this, TQT_SLOT(attributeAdded(UMLClassifierListItem*))); - connect( classifier, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(attributeRemoved(UMLClassifierListItem*))); + connect( classifier, TQ_SIGNAL(attributeAdded(UMLClassifierListItem*)), + this, TQ_SLOT(attributeAdded(UMLClassifierListItem*))); + connect( classifier, TQ_SIGNAL(attributeRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(attributeRemoved(UMLClassifierListItem*))); TQListViewItem *attsFolder = new TDEListViewItem( classifierItem, i18n("Attributes"), "attributes" ); attsFolder->setPixmap(0,SmallIcon("folder_green_open")); @@ -491,10 +491,10 @@ void RefactoringAssistant::addClassifier( UMLClassifier *classifier, TQListViewI } // add operations - connect( classifier, TQT_SIGNAL(operationAdded(UMLClassifierListItem*)), - this, TQT_SLOT(operationAdded(UMLClassifierListItem*))); - connect( classifier, TQT_SIGNAL(operationRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(operationRemoved(UMLClassifierListItem*))); + connect( classifier, TQ_SIGNAL(operationAdded(UMLClassifierListItem*)), + this, TQ_SLOT(operationAdded(UMLClassifierListItem*))); + connect( classifier, TQ_SIGNAL(operationRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(operationRemoved(UMLClassifierListItem*))); TQListViewItem *opsFolder = new TDEListViewItem( classifierItem, i18n("Operations"), "operations" ); opsFolder->setPixmap(0,SmallIcon("folder_blue_open")); diff --git a/umbrello/umbrello/toolbarstate.cpp b/umbrello/umbrello/toolbarstate.cpp index cae6acf8..d539c512 100644 --- a/umbrello/umbrello/toolbarstate.cpp +++ b/umbrello/umbrello/toolbarstate.cpp @@ -32,17 +32,17 @@ void ToolBarState::init() { m_currentWidget = 0; m_currentAssociation = 0; - connect(m_pUMLView, TQT_SIGNAL(sigAssociationRemoved(AssociationWidget*)), - this, TQT_SLOT(slotAssociationRemoved(AssociationWidget*))); - connect(m_pUMLView, TQT_SIGNAL(sigWidgetRemoved(UMLWidget*)), - this, TQT_SLOT(slotWidgetRemoved(UMLWidget*))); + connect(m_pUMLView, TQ_SIGNAL(sigAssociationRemoved(AssociationWidget*)), + this, TQ_SLOT(slotAssociationRemoved(AssociationWidget*))); + connect(m_pUMLView, TQ_SIGNAL(sigWidgetRemoved(UMLWidget*)), + this, TQ_SLOT(slotWidgetRemoved(UMLWidget*))); } void ToolBarState::cleanBeforeChange() { - disconnect(m_pUMLView, TQT_SIGNAL(sigAssociationRemoved(AssociationWidget*)), - this, TQT_SLOT(slotAssociationRemoved(AssociationWidget*))); - disconnect(m_pUMLView, TQT_SIGNAL(sigWidgetRemoved(UMLWidget*)), - this, TQT_SLOT(slotWidgetRemoved(UMLWidget*))); + disconnect(m_pUMLView, TQ_SIGNAL(sigAssociationRemoved(AssociationWidget*)), + this, TQ_SLOT(slotAssociationRemoved(AssociationWidget*))); + disconnect(m_pUMLView, TQ_SIGNAL(sigWidgetRemoved(UMLWidget*)), + this, TQ_SLOT(slotWidgetRemoved(UMLWidget*))); } void ToolBarState::mousePress(TQMouseEvent* ome) { diff --git a/umbrello/umbrello/uml.cpp b/umbrello/umbrello/uml.cpp index a4feb485..46c874c2 100644 --- a/umbrello/umbrello/uml.cpp +++ b/umbrello/umbrello/uml.cpp @@ -33,7 +33,7 @@ #include <kprinter.h> #include <tdemenubar.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kstatusbar.h> #include <ktip.h> #include <ktabwidget.h> @@ -81,7 +81,7 @@ UMLApp::UMLApp(TQWidget* , const char* name):KDockMainWindow(0, name) { s_instance = this; m_pDocWindow = 0; - m_config = kapp->config(); + m_config = tdeApp->config(); m_listView = 0; m_langSelect = NULL; m_zoomSelect = NULL; @@ -134,8 +134,8 @@ UMLApp::UMLApp(TQWidget* , const char* name):KDockMainWindow(0, name) { //connect zoomSelect menu m_zoomSelect->setCheckable(true); - connect(m_zoomSelect,TQT_SIGNAL(aboutToShow()),this,TQT_SLOT(setupZoomMenu())); - connect(m_zoomSelect,TQT_SIGNAL(activated(int)),this,TQT_SLOT(setZoom(int))); + connect(m_zoomSelect,TQ_SIGNAL(aboutToShow()),this,TQ_SLOT(setupZoomMenu())); + connect(m_zoomSelect,TQ_SIGNAL(activated(int)),this,TQ_SLOT(setZoom(int))); m_refactoringAssist = 0L; @@ -160,43 +160,43 @@ UMLApp* UMLApp::app() } void UMLApp::initActions() { - fileNew = KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(slotFileNew()), actionCollection()); - fileOpen = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); - fileOpenRecent = KStdAction::openRecent(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); - fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); - fileSaveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); - fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotFileClose()), actionCollection()); - filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection()); - fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); - editUndo = KStdAction::undo(TQT_TQOBJECT(this), TQT_SLOT(slotEditUndo()), actionCollection()); - editRedo = KStdAction::redo(TQT_TQOBJECT(this), TQT_SLOT(slotEditRedo()), actionCollection()); - editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotEditCut()), actionCollection()); - editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotEditCopy()), actionCollection()); - editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotEditPaste()), actionCollection()); + fileNew = KStdAction::openNew(this, TQ_SLOT(slotFileNew()), actionCollection()); + fileOpen = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection()); + fileOpenRecent = KStdAction::openRecent(this, TQ_SLOT(slotFileOpenRecent(const KURL&)), actionCollection()); + fileSave = KStdAction::save(this, TQ_SLOT(slotFileSave()), actionCollection()); + fileSaveAs = KStdAction::saveAs(this, TQ_SLOT(slotFileSaveAs()), actionCollection()); + fileClose = KStdAction::close(this, TQ_SLOT(slotFileClose()), actionCollection()); + filePrint = KStdAction::print(this, TQ_SLOT(slotFilePrint()), actionCollection()); + fileQuit = KStdAction::quit(this, TQ_SLOT(slotFileQuit()), actionCollection()); + editUndo = KStdAction::undo(this, TQ_SLOT(slotEditUndo()), actionCollection()); + editRedo = KStdAction::redo(this, TQ_SLOT(slotEditRedo()), actionCollection()); + editCut = KStdAction::cut(this, TQ_SLOT(slotEditCut()), actionCollection()); + editCopy = KStdAction::copy(this, TQ_SLOT(slotEditCopy()), actionCollection()); + editPaste = KStdAction::paste(this, TQ_SLOT(slotEditPaste()), actionCollection()); createStandardStatusBarAction(); setStandardToolBarMenuEnabled(true); - selectAll = KStdAction::selectAll(TQT_TQOBJECT(this), TQT_SLOT( slotSelectAll() ), actionCollection()); + selectAll = KStdAction::selectAll(this, TQ_SLOT( slotSelectAll() ), actionCollection()); fileExportDocbook = new TDEAction(i18n("&Export model to DocBook"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotFileExportDocbook() ), + this, TQ_SLOT( slotFileExportDocbook() ), actionCollection(), "file_export_docbook"); fileExportXhtml = new TDEAction(i18n("&Export model to XHTML"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotFileExportXhtml() ), + this, TQ_SLOT( slotFileExportXhtml() ), actionCollection(), "file_export_xhtml"); - classWizard = new TDEAction(i18n("&New Class Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(slotClassWizard()), + classWizard = new TDEAction(i18n("&New Class Wizard..."),0,this,TQ_SLOT(slotClassWizard()), actionCollection(),"class_wizard"); - new TDEAction(i18n("&Add Default Datatypes for Active Language"), 0, TQT_TQOBJECT(this), - TQT_SLOT(slotAddDefaultDatatypes()), actionCollection(), "create_default_datatypes"); + new TDEAction(i18n("&Add Default Datatypes for Active Language"), 0, this, + TQ_SLOT(slotAddDefaultDatatypes()), actionCollection(), "create_default_datatypes"); - preferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT( slotPrefs() ), actionCollection()); + preferences = KStdAction::preferences(this, TQ_SLOT( slotPrefs() ), actionCollection()); - genWizard = new TDEAction(i18n("&Code Generation Wizard..."),0,TQT_TQOBJECT(this),TQT_SLOT(generationWizard()), + genWizard = new TDEAction(i18n("&Code Generation Wizard..."),0,this,TQ_SLOT(generationWizard()), actionCollection(),"generation_wizard"); - genAll = new TDEAction(i18n("&Generate All Code"),0,TQT_TQOBJECT(this),TQT_SLOT(generateAllCode()), + genAll = new TDEAction(i18n("&Generate All Code"),0,this,TQ_SLOT(generateAllCode()), actionCollection(),"generate_all"); importClasses = new TDEAction(i18n("&Import Classes..."), SmallIconSet("text-x-c++src"), 0, - TQT_TQOBJECT(this),TQT_SLOT(slotImportClasses()), actionCollection(),"import_class"); + this,TQ_SLOT(slotImportClasses()), actionCollection(),"import_class"); fileNew->setToolTip(i18n("Creates a new document")); fileOpen->setToolTip(i18n("Opens an existing document")); @@ -215,63 +215,63 @@ void UMLApp::initActions() { deleteSelectedWidget = new TDEAction( i18n("Delete &Selected"), SmallIconSet("edit-delete"), - TDEShortcut(TQt::Key_Delete), TQT_TQOBJECT(this), - TQT_SLOT( slotDeleteSelectedWidget() ), actionCollection(), + TDEShortcut(TQt::Key_Delete), this, + TQ_SLOT( slotDeleteSelectedWidget() ), actionCollection(), "delete_selected" ); // The different views newDiagram = new TDEActionMenu(0, SmallIconSet("document-new"), actionCollection(), "new_view"); classDiagram = new TDEAction( i18n( "&Class Diagram..." ), SmallIconSet("umbrello_diagram_class"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" ); + this, TQ_SLOT( slotClassDiagram() ), actionCollection(), "new_class_diagram" ); #if defined (HAVE_DOT) - autolayout = new TDEAction(i18n("&Autolayout..."),0,0,TQT_TQOBJECT(this),TQT_SLOT(slotAutolayout()), + autolayout = new TDEAction(i18n("&Autolayout..."),0,0,this,TQ_SLOT(slotAutolayout()), actionCollection(),"autolayout"); #endif sequenceDiagram= new TDEAction( i18n( "&Sequence Diagram..." ), SmallIconSet("umbrello_diagram_sequence"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" ); + this, TQ_SLOT( slotSequenceDiagram() ), actionCollection(), "new_sequence_diagram" ); collaborationDiagram = new TDEAction( i18n( "C&ollaboration Diagram..." ), SmallIconSet("umbrello_diagram_collaboration"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" ); + this, TQ_SLOT( slotCollaborationDiagram() ), actionCollection(), "new_collaboration_diagram" ); useCaseDiagram= new TDEAction( i18n( "&Use Case Diagram..." ), SmallIconSet("umbrello_diagram_usecase"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" ); + this, TQ_SLOT( slotUseCaseDiagram() ), actionCollection(), "new_use_case_diagram" ); stateDiagram= new TDEAction( i18n( "S&tate Diagram..." ), SmallIconSet("umbrello_diagram_state"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" ); + this, TQ_SLOT( slotStateDiagram() ), actionCollection(), "new_state_diagram" ); activityDiagram= new TDEAction( i18n( "&Activity Diagram..." ), SmallIconSet("umbrello_diagram_activity"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" ); + this, TQ_SLOT( slotActivityDiagram() ), actionCollection(), "new_activity_diagram" ); componentDiagram = new TDEAction( i18n("Co&mponent Diagram..."), SmallIconSet("umbrello_diagram_component"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotComponentDiagram() ), actionCollection(), + this, TQ_SLOT( slotComponentDiagram() ), actionCollection(), "new_component_diagram" ); deploymentDiagram = new TDEAction( i18n("&Deployment Diagram..."), SmallIconSet("umbrello_diagram_deployment"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotDeploymentDiagram() ), actionCollection(), + this, TQ_SLOT( slotDeploymentDiagram() ), actionCollection(), "new_deployment_diagram" ); entityRelationshipDiagram = new TDEAction( i18n("&Entity Relationship Diagram..."), SmallIconSet("umbrello_diagram_entityrelationship"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotEntityRelationshipDiagram() ), actionCollection(), + this, TQ_SLOT( slotEntityRelationshipDiagram() ), actionCollection(), "new_entityrelationship_diagram" ); viewClearDiagram = new TDEAction(i18n("&Clear Diagram"), SmallIconSet("edit-clear"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram"); + this, TQ_SLOT( slotCurrentViewClearDiagram() ), actionCollection(), "view_clear_diagram"); viewSnapToGrid = new TDEToggleAction(i18n("&Snap to Grid"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid"); + this, TQ_SLOT( slotCurrentViewToggleSnapToGrid() ), actionCollection(), "view_snap_to_grid"); viewShowGrid = new TDEToggleAction(i18n("S&how Grid"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid"); + this, TQ_SLOT( slotCurrentViewToggleShowGrid() ), actionCollection(), "view_show_grid"); #if (TDE_VERSION_MINOR>=3) && (TDE_VERSION_MAJOR>=3) viewShowGrid->setCheckedState(i18n("&Hide Grid")); #endif deleteDiagram = new TDEAction(i18n("&Delete"), SmallIconSet("edit-delete"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete"); + this, TQ_SLOT( slotDeleteDiagram() ), actionCollection(), "view_delete"); viewExportImage = new TDEAction(i18n("&Export as Picture..."), SmallIconSet("image-x-generic"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image"); + this, TQ_SLOT( slotCurrentViewExportImage() ), actionCollection(), "view_export_image"); viewExportImageAll = new TDEAction(i18n("Export &All Diagrams as Pictures..."), SmallIconSet("image-x-generic"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all"); + this, TQ_SLOT( slotAllViewsExportImage() ), actionCollection(), "view_export_image_all"); viewProperties = new TDEAction(i18n("&Properties"), SmallIconSet("application-vnd.tde.info"), 0, - TQT_TQOBJECT(this), TQT_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties"); + this, TQ_SLOT( slotCurrentViewProperties() ), actionCollection(), "view_properties"); viewSnapToGrid->setChecked(false); viewShowGrid->setChecked(false); @@ -284,35 +284,35 @@ void UMLApp::initActions() { viewProperties->setEnabled(false); zoomAction = new KPlayerPopupSliderAction(i18n("&Zoom Slider"), "viewmag", Key_F9, - TQT_TQOBJECT(this), TQT_SLOT(slotZoomSliderMoved(int)), + this, TQ_SLOT(slotZoomSliderMoved(int)), actionCollection(), "popup_zoom"); zoom100Action = new TDEAction(i18n( "Z&oom to 100%" ), "zoom-original", 0, - TQT_TQOBJECT(this), TQT_SLOT( slotZoom100() ), actionCollection(), + this, TQ_SLOT( slotZoom100() ), actionCollection(), "zoom100"); - KStdAction::tipOfDay( TQT_TQOBJECT(this), TQT_SLOT( tipOfTheDay() ), actionCollection() ); + KStdAction::tipOfDay( this, TQ_SLOT( tipOfTheDay() ), actionCollection() ); TQString moveTabLeftString = i18n("&Move Tab Left"); TQString moveTabRightString = i18n("&Move Tab Right"); 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(), + this, TQ_SLOT(slotMoveTabLeft()), actionCollection(), "move_tab_left"); 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(), + this, TQ_SLOT(slotMoveTabRight()), actionCollection(), "move_tab_right"); TQString selectTabLeftString = i18n("Select Diagram on Left"); TQString selectTabRightString = i18n("Select Diagram on Right"); 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"); + this, TQ_SLOT(slotChangeTabLeft()), actionCollection(), "previous_tab"); 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"); + this, TQ_SLOT(slotChangeTabRight()), actionCollection(), "next_tab"); initStatusBar(); //call this here because the statusBar is shown/hidden by setupGUI() @@ -384,7 +384,7 @@ void UMLApp::initStatusBar() { m_statusLabel->setAlignment(TQt::AlignLeft|TQt::AlignVCenter); - connect(m_doc, TQT_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQT_SLOT( slotStatusMsg(const TQString &) )); + connect(m_doc, TQ_SIGNAL( sigWriteToStatusBar(const TQString &) ), this, TQ_SLOT( slotStatusMsg(const TQString &) )); } void UMLApp::initView() { @@ -417,15 +417,15 @@ void UMLApp::initView() { m_newSessionButton->setAutoRaise(true); 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()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Collaboration), i18n("Collaboration Diagram..."), this, TQT_SLOT(slotCollaborationDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_UseCase), i18n("Use Case Diagram..."), this, TQT_SLOT(slotUseCaseDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_State), i18n("State Diagram..."), this, TQT_SLOT(slotStateDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Activity), i18n("Activity Diagram..."), this, TQT_SLOT(slotActivityDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Component), i18n("Component Diagram..."), this, TQT_SLOT(slotComponentDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Deployment), i18n("Deployment Diagram..."), this, TQT_SLOT(slotDeploymentDiagram()) ); - m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_EntityRelationship), i18n("Entity Relationship Diagram..."), this, TQT_SLOT(slotEntityRelationshipDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Class), i18n("Class Diagram..."), this, TQ_SLOT(slotClassDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Sequence), i18n("Sequence Diagram..."), this, TQ_SLOT(slotSequenceDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Collaboration), i18n("Collaboration Diagram..."), this, TQ_SLOT(slotCollaborationDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_UseCase), i18n("Use Case Diagram..."), this, TQ_SLOT(slotUseCaseDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_State), i18n("State Diagram..."), this, TQ_SLOT(slotStateDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Activity), i18n("Activity Diagram..."), this, TQ_SLOT(slotActivityDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Component), i18n("Component Diagram..."), this, TQ_SLOT(slotComponentDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_Deployment), i18n("Deployment Diagram..."), this, TQ_SLOT(slotDeploymentDiagram()) ); + m_diagramMenu->insertItem(Widget_Utils::iconSet(Uml::dt_EntityRelationship), i18n("Entity Relationship Diagram..."), this, TQ_SLOT(slotEntityRelationshipDiagram()) ); m_newSessionButton->setPopup(m_diagramMenu); //FIXME why doesn't this work? //m_newSessionButton->setPopup(newDiagram->popupMenu()); @@ -435,9 +435,9 @@ void UMLApp::initView() { m_closeDiagramButton->setIconSet( SmallIcon("tab_remove") ); m_closeDiagramButton->adjustSize(); - connect(m_closeDiagramButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotDeleteDiagram())); - connect(m_tabWidget, TQT_SIGNAL(currentChanged(TQWidget*)), TQT_SLOT(slotTabChanged(TQWidget*))); - connect(m_tabWidget, TQT_SIGNAL(contextMenu(TQWidget*,const TQPoint&)), m_doc, TQT_SLOT(slotDiagramPopupMenu(TQWidget*,const TQPoint&))); + connect(m_closeDiagramButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotDeleteDiagram())); + connect(m_tabWidget, TQ_SIGNAL(currentChanged(TQWidget*)), TQ_SLOT(slotTabChanged(TQWidget*))); + connect(m_tabWidget, TQ_SIGNAL(contextMenu(TQWidget*,const TQPoint&)), m_doc, TQ_SLOT(slotDiagramPopupMenu(TQWidget*,const TQPoint&))); m_tabWidget->setCornerWidget( m_newSessionButton, TopLeft ); m_tabWidget->setCornerWidget( m_closeDiagramButton, TopRight ); m_newSessionButton->installEventFilter(this); @@ -595,7 +595,7 @@ void UMLApp::saveProperties(TDEConfig *_config) { KURL url=m_doc->URL(); _config->writePathEntry("filename", url.url()); _config->writeEntry("modified", m_doc->isModified()); - TQString tempname = kapp->tempSaveName(url.url()); + TQString tempname = tdeApp->tempSaveName(url.url()); TQString tempurl= KURL::encode_string(tempname); KURL _url(tempurl); @@ -609,7 +609,7 @@ void UMLApp::readProperties(TDEConfig* _config) { bool modified = _config->readBoolEntry("modified", false); if(modified) { bool canRecover; - TQString tempname = kapp->checkRecoverFile(filename, canRecover); + TQString tempname = tdeApp->checkRecoverFile(filename, canRecover); KURL _url(tempname); @@ -788,7 +788,7 @@ void UMLApp::slotFileQuit() { if(m_doc->saveModified()) { writeDockConfig(); saveOptions(); - kapp->quit(); + tdeApp->quit(); } slotStatusMsg(i18n("Ready.")); } @@ -806,7 +806,7 @@ void UMLApp::slotFileExportXhtml() } m_xhtmlGenerator = new XhtmlGenerator(); m_xhtmlGenerator->generateXhtmlForProject(); - connect(m_xhtmlGenerator,TQT_SIGNAL(finished()),this,TQT_SLOT(slotXhtmlDocGenerationFinished())); + connect(m_xhtmlGenerator,TQ_SIGNAL(finished()),this,TQ_SLOT(slotXhtmlDocGenerationFinished())); } void UMLApp::slotEditUndo() { @@ -978,7 +978,7 @@ void UMLApp::enableRedo(bool enable) { /** initialize the QT's global clipboard support for the application */ void UMLApp::initClip() { TQClipboard* clip = TQApplication::clipboard(); - connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); + connect(clip, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipDataChanged())); // Don't poll the X11 clipboard every second. This is a little expensive and resulted // in very annoying umbrello slowdowns / hangs. TQt will notify us about clipboard @@ -987,11 +987,11 @@ void UMLApp::initClip() { // as well. (pfeiffer) // m_clipTimer = new TQTimer(this, "timer"); // m_clipTimer->start(1000, false); - // connect(m_clipTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotClipDataChanged())); + // connect(m_clipTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotClipDataChanged())); m_copyTimer = new TQTimer(this, "copytimer"); m_copyTimer->start(500, false); - connect(m_copyTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCopyChanged())); + connect(m_copyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCopyChanged())); } bool UMLApp::canDecode(const TQMimeSource* mimeSource) { @@ -1030,7 +1030,7 @@ void UMLApp::slotPrefs() { optionState.generalState.tip = m_config->readBoolEntry( "RunOnStart", true ); m_dlg = new SettingsDlg(this, &optionState); - connect(m_dlg, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApplyPrefs() ) ); + connect(m_dlg, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApplyPrefs() ) ); if ( m_dlg->exec() == TQDialog::Accepted && m_dlg->getChangesApplied() ) { slotApplyPrefs(); @@ -1077,7 +1077,7 @@ bool UMLApp::editCutCopy( bool bFromView ) { if ((clipdata = clipboard.copy(bFromView)) != 0) { TQClipboard* clip = TQApplication::clipboard(); clip->setData(clipdata);//the global clipboard takes ownership of the clipdata memory - connect(clip, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipDataChanged())); + connect(clip, TQ_SIGNAL(dataChanged()), this, TQ_SLOT(slotClipDataChanged())); return true; } return false; @@ -1371,7 +1371,7 @@ void UMLApp::slotUpdateViews() { UMLViewList views = getDocument()->getViewIterator(); for(UMLView *view = views.first(); view; view = views.next()) { - menu->insertItem( view->getName(), view, TQT_SLOT( slotShowView() ) ); + menu->insertItem( view->getName(), view, TQ_SLOT( slotShowView() ) ); view->fileLoaded(); } } @@ -1423,10 +1423,10 @@ void UMLApp::slotAddDefaultDatatypes() { void UMLApp::slotCurrentViewChanged() { UMLView *view = getCurrentView(); if (view) { - connect(view, TQT_SIGNAL( sigShowGridToggled(bool) ), - this, TQT_SLOT( slotShowGridToggled(bool) ) ); - connect(view, TQT_SIGNAL( sigSnapToGridToggled(bool) ), - this, TQT_SLOT( slotSnapToGridToggled(bool) ) ); + connect(view, TQ_SIGNAL( sigShowGridToggled(bool) ), + this, TQ_SLOT( slotShowGridToggled(bool) ) ); + connect(view, TQ_SIGNAL( sigSnapToGridToggled(bool) ), + this, TQ_SLOT( slotSnapToGridToggled(bool) ) ); } } void UMLApp::slotSnapToGridToggled(bool gridOn) { @@ -1476,7 +1476,7 @@ void UMLApp::updateLangSelectMenu(Uml::Programming_Language activeLanguage) { m_langSelect->setCheckable(true); for (int i = 0; i < Uml::pl_Reserved; i++) { TQString language = Model_Utils::progLangToString((Uml::Programming_Language) i); - int id = m_langSelect->insertItem(language,this,TQT_SLOT(setActiveLanguage(int))); + int id = m_langSelect->insertItem(language,this,TQ_SLOT(setActiveLanguage(int))); const bool isActiveLanguage = (activeLanguage == i); m_langSelect->setItemChecked(id, isActiveLanguage); } diff --git a/umbrello/umbrello/umldoc.cpp b/umbrello/umbrello/umldoc.cpp index fd9eedb9..fec8cc85 100644 --- a/umbrello/umbrello/umldoc.cpp +++ b/umbrello/umbrello/umldoc.cpp @@ -120,10 +120,10 @@ void UMLDoc::init() { // Connect signals. UMLApp * pApp = UMLApp::app(); - connect(this, TQT_SIGNAL(sigDiagramCreated(Uml::IDType)), pApp, TQT_SLOT(slotUpdateViews())); - connect(this, TQT_SIGNAL(sigDiagramRemoved(Uml::IDType)), pApp, TQT_SLOT(slotUpdateViews())); - connect(this, TQT_SIGNAL(sigDiagramRenamed(Uml::IDType)), pApp, TQT_SLOT(slotUpdateViews())); - connect(this, TQT_SIGNAL( sigCurrentViewChanged() ), pApp, TQT_SLOT( slotCurrentViewChanged() ) ); + connect(this, TQ_SIGNAL(sigDiagramCreated(Uml::IDType)), pApp, TQ_SLOT(slotUpdateViews())); + connect(this, TQ_SIGNAL(sigDiagramRemoved(Uml::IDType)), pApp, TQ_SLOT(slotUpdateViews())); + connect(this, TQ_SIGNAL(sigDiagramRenamed(Uml::IDType)), pApp, TQ_SLOT(slotUpdateViews())); + connect(this, TQ_SIGNAL( sigCurrentViewChanged() ), pApp, TQ_SLOT( slotCurrentViewChanged() ) ); } UMLDoc::~UMLDoc() { @@ -145,7 +145,7 @@ void UMLDoc::addView(UMLView *view) { UMLApp * pApp = UMLApp::app(); if ( pApp->getListView() ) - connect(this, TQT_SIGNAL(sigObjectRemoved(UMLObject *)), view, TQT_SLOT(slotObjectRemoved(UMLObject *))); + connect(this, TQ_SIGNAL(sigObjectRemoved(UMLObject *)), view, TQ_SLOT(slotObjectRemoved(UMLObject *))); pApp->setCurrentView(view); if ( ! m_bLoading ) { @@ -176,7 +176,7 @@ void UMLDoc::removeView(UMLView *view , bool enforceCurrentView ) { return; } if ( UMLApp::app()->getListView() ) { - disconnect(this,TQT_SIGNAL(sigObjectRemoved(UMLObject *)), view,TQT_SLOT(slotObjectRemoved(UMLObject *))); + disconnect(this,TQ_SIGNAL(sigObjectRemoved(UMLObject *)), view,TQ_SLOT(slotObjectRemoved(UMLObject *))); } view->hide(); //remove all widgets before deleting view @@ -198,7 +198,7 @@ void UMLDoc::removeView(UMLView *view , bool enforceCurrentView ) { if (!firstView && enforceCurrentView) //create a diagram { createDiagram(m_root[mt_Logical], dt_Class, false); - kapp->processEvents(); + tdeApp->processEvents(); m_root[mt_Logical]->appendViews(viewList); firstView = viewList.first(); } @@ -649,7 +649,7 @@ void UMLDoc::setupSignals() { WorkToolBar *tb = UMLApp::app() -> getWorkToolBar(); - connect(this, TQT_SIGNAL(sigDiagramChanged(Uml::Diagram_Type)), tb, TQT_SLOT(slotCheckToolBar(Uml::Diagram_Type))); + connect(this, TQ_SIGNAL(sigDiagramChanged(Uml::Diagram_Type)), tb, TQ_SLOT(slotCheckToolBar(Uml::Diagram_Type))); //new signals below return; @@ -1063,7 +1063,7 @@ void UMLDoc::renameChildUMLObject(UMLObject *o) { KMessageBox::error(0, i18n("That is an invalid name."), i18n("Invalid Name")); else { if (p->findChildObject(name) == NULL - || ((o->getBaseType() == Uml::ot_Operation) && KMessageBox::warningYesNo( kapp -> mainWidget() , + || ((o->getBaseType() == Uml::ot_Operation) && KMessageBox::warningYesNo( tdeApp -> mainWidget() , i18n( "The name you entered was not unique.\nIs this what you wanted?" ), i18n( "Name Not Unique"),i18n("Use Name"),i18n("Enter New Name")) == KMessageBox::Yes) ) { o->setName(name); @@ -1443,7 +1443,7 @@ bool UMLDoc::loadFromXMI( TQIODevice & file, short encode ) } TQString data = stream.read(); - kapp->processEvents(); // give UI events a chance + tdeApp->processEvents(); // give UI events a chance TQString error; int line; TQDomDocument doc; @@ -1451,7 +1451,7 @@ bool UMLDoc::loadFromXMI( TQIODevice & file, short encode ) kWarning()<<"Can't set content:"<<error<<" Line:"<<line<<endl; return false; } - kapp->processEvents(); // give UI events a chance + tdeApp->processEvents(); // give UI events a chance TQDomNode node = doc.firstChild(); //Before Umbrello 1.1-rc1 we didn't add a <?xml heading //so we allow the option of this being missing @@ -1571,7 +1571,7 @@ bool UMLDoc::loadFromXMI( TQIODevice & file, short encode ) if (UMLApp::app()->getGenerator() == NULL) UMLApp::app()->setGenerator(UMLApp::app()->getDefaultLanguage()); emit sigWriteToStatusBar( i18n("Setting up the document...") ); - kapp->processEvents(); // give UI events a chance + tdeApp->processEvents(); // give UI events a chance activateAllViews(); UMLView *viewToBeSet = NULL; @@ -1606,7 +1606,7 @@ void UMLDoc::resolveTypes() { #endif obj->resolveRef(); } - kapp->processEvents(); // give UI events a chance + tdeApp->processEvents(); // give UI events a chance } bool UMLDoc::validateXMIHeader(TQDomNode& headerNode) { @@ -1845,7 +1845,7 @@ bool UMLDoc::loadDiagramsFromXMI( TQDomNode & node ) { pView -> hide(); addView( pView ); emit sigSetStatusbarProgress( ++count ); - kapp->processEvents(); // give UI events a chance + tdeApp->processEvents(); // give UI events a chance } node = node.nextSibling(); element = node.toElement(); @@ -2081,14 +2081,14 @@ void UMLDoc::settingsChanged(Settings::OptionState optionState) { void UMLDoc::initSaveTimer() { if( m_pAutoSaveTimer ) { m_pAutoSaveTimer -> stop(); - disconnect( m_pAutoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoSave() ) ); + disconnect( m_pAutoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoSave() ) ); delete m_pAutoSaveTimer; m_pAutoSaveTimer = 0; } Settings::OptionState optionState = Settings::getOptionState(); if( optionState.generalState.autosave ) { m_pAutoSaveTimer = new TQTimer(this, "_AUTOSAVETIMER_" ); - connect( m_pAutoSaveTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotAutoSave() ) ); + connect( m_pAutoSaveTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotAutoSave() ) ); m_pAutoSaveTimer->start( optionState.generalState.autosavetime * 60000, false ); } return; @@ -2338,7 +2338,7 @@ void UMLDoc::slotDiagramPopupMenu(TQWidget* umlview, const TQPoint& point) { m_pTabPopupMenu = new ListPopupMenu(UMLApp::app()->getMainViewWidget(), type); m_pTabPopupMenu->popup(point); - connect(m_pTabPopupMenu, TQT_SIGNAL(activated(int)), view, TQT_SLOT(slotMenuSelection(int))); + connect(m_pTabPopupMenu, TQ_SIGNAL(activated(int)), view, TQ_SLOT(slotMenuSelection(int))); } void UMLDoc::addDefaultStereotypes() { diff --git a/umbrello/umbrello/umllistview.cpp b/umbrello/umbrello/umllistview.cpp index 0a7b1183..58834174 100644 --- a/umbrello/umbrello/umllistview.cpp +++ b/umbrello/umbrello/umllistview.cpp @@ -25,7 +25,7 @@ #include <tdefiledialog.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <kinputdialog.h> // app includes @@ -131,12 +131,12 @@ UMLListView::UMLListView(TQWidget *parent, const char *name) m_lv[i] = NULL; m_datatypeFolder = NULL; //setup slots/signals - connect(this, TQT_SIGNAL(dropped(TQDropEvent *, TQListViewItem *, TQListViewItem *)), - this, TQT_SLOT(slotDropped(TQDropEvent *, TQListViewItem *, TQListViewItem *))); - connect( this, TQT_SIGNAL( collapsed( TQListViewItem * ) ), - this, TQT_SLOT( slotCollapsed( TQListViewItem * ) ) ); - connect( this, TQT_SIGNAL( expanded( TQListViewItem * ) ), this, TQT_SLOT( slotExpanded( TQListViewItem * ) ) ); - connect( UMLApp::app(), TQT_SIGNAL( sigCutSuccessful() ), this, TQT_SLOT( slotCutSuccessful() ) ); + connect(this, TQ_SIGNAL(dropped(TQDropEvent *, TQListViewItem *, TQListViewItem *)), + this, TQ_SLOT(slotDropped(TQDropEvent *, TQListViewItem *, TQListViewItem *))); + connect( this, TQ_SIGNAL( collapsed( TQListViewItem * ) ), + this, TQ_SLOT( slotCollapsed( TQListViewItem * ) ) ); + connect( this, TQ_SIGNAL( expanded( TQListViewItem * ) ), this, TQ_SLOT( slotExpanded( TQListViewItem * ) ) ); + connect( UMLApp::app(), TQ_SIGNAL( sigCutSuccessful() ), this, TQ_SLOT( slotCutSuccessful() ) ); } UMLListView::~UMLListView() {} @@ -148,12 +148,12 @@ bool UMLListView::eventFilter(TQObject *o, TQEvent *e) { if (me->button() == TQt::RightButton) { if (m_pMenu) { m_pMenu->hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupMenuSel(int))); delete m_pMenu; } m_pMenu = new ListPopupMenu(this, Uml::lvt_Model); m_pMenu->popup(me->globalPos()); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupMenuSel(int))); return true; } return TQListView::eventFilter(o, e); @@ -184,14 +184,14 @@ void UMLListView::contentsMousePressEvent(TQMouseEvent *me) { if (button == TQt::RightButton) { if(m_pMenu != 0) { m_pMenu->hide(); - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupMenuSel(int))); delete m_pMenu; m_pMenu = 0; } const Uml::ListView_Type type = item->getType(); m_pMenu = new ListPopupMenu(this, type); m_pMenu->popup(me->globalPos()); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupMenuSel(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupMenuSel(int))); }//end if right button this->TDEListView::contentsMousePressEvent(me); @@ -692,40 +692,40 @@ void UMLListView::connectNewObjectsSlots(UMLObject* object) { case Uml::ot_Interface: { UMLClassifier *c = static_cast<UMLClassifier*>(object); - connect(c, TQT_SIGNAL(attributeAdded(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectAdded(UMLClassifierListItem*))); - connect(c, TQT_SIGNAL(attributeRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectRemoved(UMLClassifierListItem*))); - connect(c, TQT_SIGNAL(operationAdded(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectAdded(UMLClassifierListItem*))); - connect(c, TQT_SIGNAL(operationRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectRemoved(UMLClassifierListItem*))); - connect(c, TQT_SIGNAL(templateAdded(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectAdded(UMLClassifierListItem*))); - connect(c, TQT_SIGNAL(templateRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectRemoved(UMLClassifierListItem*))); - connect(object,TQT_SIGNAL(modified()),this,TQT_SLOT(slotObjectChanged())); + connect(c, TQ_SIGNAL(attributeAdded(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectAdded(UMLClassifierListItem*))); + connect(c, TQ_SIGNAL(attributeRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectRemoved(UMLClassifierListItem*))); + connect(c, TQ_SIGNAL(operationAdded(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectAdded(UMLClassifierListItem*))); + connect(c, TQ_SIGNAL(operationRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectRemoved(UMLClassifierListItem*))); + connect(c, TQ_SIGNAL(templateAdded(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectAdded(UMLClassifierListItem*))); + connect(c, TQ_SIGNAL(templateRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectRemoved(UMLClassifierListItem*))); + connect(object,TQ_SIGNAL(modified()),this,TQ_SLOT(slotObjectChanged())); } break; case Uml::ot_Enum: { UMLEnum *e = static_cast<UMLEnum*>(object); - connect(e, TQT_SIGNAL(enumLiteralAdded(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectAdded(UMLClassifierListItem*))); - connect(e, TQT_SIGNAL(enumLiteralRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectRemoved(UMLClassifierListItem*))); + connect(e, TQ_SIGNAL(enumLiteralAdded(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectAdded(UMLClassifierListItem*))); + connect(e, TQ_SIGNAL(enumLiteralRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectRemoved(UMLClassifierListItem*))); } - connect(object,TQT_SIGNAL(modified()),this,TQT_SLOT(slotObjectChanged())); + connect(object,TQ_SIGNAL(modified()),this,TQ_SLOT(slotObjectChanged())); break; case Uml::ot_Entity: { UMLEntity *ent = static_cast<UMLEntity*>(object); - connect(ent, TQT_SIGNAL(entityAttributeAdded(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectAdded(UMLClassifierListItem*))); - connect(ent, TQT_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)), - this, TQT_SLOT(childObjectRemoved(UMLClassifierListItem*))); + connect(ent, TQ_SIGNAL(entityAttributeAdded(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectAdded(UMLClassifierListItem*))); + connect(ent, TQ_SIGNAL(entityAttributeRemoved(UMLClassifierListItem*)), + this, TQ_SLOT(childObjectRemoved(UMLClassifierListItem*))); } - connect(object,TQT_SIGNAL(modified()),this,TQT_SLOT(slotObjectChanged())); + connect(object,TQ_SIGNAL(modified()),this,TQ_SLOT(slotObjectChanged())); break; case Uml::ot_Datatype: case Uml::ot_Attribute: @@ -740,7 +740,7 @@ void UMLListView::connectNewObjectsSlots(UMLObject* object) { case Uml::ot_Artifact: case Uml::ot_Node: case Uml::ot_Folder: - connect(object,TQT_SIGNAL(modified()),this,TQT_SLOT(slotObjectChanged())); + connect(object,TQ_SIGNAL(modified()),this,TQ_SLOT(slotObjectChanged())); break; case Uml::ot_UMLObject: case Uml::ot_Association: @@ -826,18 +826,18 @@ void UMLListView::setDocument(UMLDoc *d) { } m_doc = d; - connect(m_doc, TQT_SIGNAL(sigDiagramCreated(Uml::IDType)), this, TQT_SLOT(slotDiagramCreated(Uml::IDType))); - connect(m_doc, TQT_SIGNAL(sigDiagramRemoved(Uml::IDType)), this, TQT_SLOT(slotDiagramRemoved(Uml::IDType))); - connect(m_doc, TQT_SIGNAL(sigDiagramRenamed(Uml::IDType)), this, TQT_SLOT(slotDiagramRenamed(Uml::IDType))); - connect(m_doc, TQT_SIGNAL(sigObjectCreated(UMLObject *)), this, TQT_SLOT(slotObjectCreated(UMLObject *))); - connect(m_doc, TQT_SIGNAL(sigObjectRemoved(UMLObject *)), this, TQT_SLOT(slotObjectRemoved(UMLObject *))); + connect(m_doc, TQ_SIGNAL(sigDiagramCreated(Uml::IDType)), this, TQ_SLOT(slotDiagramCreated(Uml::IDType))); + connect(m_doc, TQ_SIGNAL(sigDiagramRemoved(Uml::IDType)), this, TQ_SLOT(slotDiagramRemoved(Uml::IDType))); + connect(m_doc, TQ_SIGNAL(sigDiagramRenamed(Uml::IDType)), this, TQ_SLOT(slotDiagramRenamed(Uml::IDType))); + connect(m_doc, TQ_SIGNAL(sigObjectCreated(UMLObject *)), this, TQ_SLOT(slotObjectCreated(UMLObject *))); + connect(m_doc, TQ_SIGNAL(sigObjectRemoved(UMLObject *)), this, TQ_SLOT(slotObjectRemoved(UMLObject *))); } void UMLListView::slotObjectRemoved(UMLObject* object) { if (m_doc->loading()) { //needed for class wizard return; } - disconnect(object,TQT_SIGNAL(modified()),this,TQT_SLOT(slotObjectChanged())); + disconnect(object,TQ_SIGNAL(modified()),this,TQ_SLOT(slotObjectChanged())); UMLListViewItem* item = findItem(object->getID()); delete item; UMLApp::app()->getDocWindow()->updateDocumentation(true); @@ -1902,7 +1902,7 @@ bool UMLListView::itemRenamed( TQListViewItem * item , int /*col*/ ) { // If the type is empty then delete it. if (newText.isEmpty() || newText.contains(TQRegExp("^\\s+$"))) { KMessageBox::error( - kapp -> mainWidget(), + tdeApp -> mainWidget(), i18n( "The name you entered was invalid.\nCreation process has been canceled." ), i18n( "Name Not Valid" ) ); return false; @@ -1912,14 +1912,14 @@ bool UMLListView::itemRenamed( TQListViewItem * item , int /*col*/ ) { //if operation ask if ok not to be unique i.e overloading if( type == Uml::lvt_Operation ) { if( KMessageBox::warningYesNo( - kapp -> mainWidget(), + tdeApp -> mainWidget(), i18n( "The name you entered was not unique.\nIs this what you wanted?" ), i18n( "Name Not Unique" ), i18n("Use Name"), i18n("Enter New Name") ) == KMessageBox::No ) { return false; } } else { KMessageBox::error( - kapp -> mainWidget(), + tdeApp -> mainWidget(), i18n( "The name you entered was not unique!\nCreation process has been canceled." ), i18n( "Name Not Unique" ) ); return false; @@ -2113,7 +2113,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type Model_Utils::NameAndType nt; Model_Utils::Parse_Status st = Model_Utils::parseTemplate(text, nt, owningClassifier); if (st) { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Creation canceled") ); m_bCreatingChildObject = false; @@ -2130,7 +2130,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type Model_Utils::Parse_Status st; st = Model_Utils::parseAttribute(text, nt, owningClass, &vis); if (st) { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Creation canceled") ); m_bCreatingChildObject = false; @@ -2145,7 +2145,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type Model_Utils::OpDescriptor od; Model_Utils::Parse_Status st = Model_Utils::parseOperation(text, od, owningClassifier); if (st) { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Creation canceled") ); m_bCreatingChildObject = false; @@ -2156,7 +2156,7 @@ bool UMLListView::createChildUMLObject( UMLListViewItem * item, Uml::Object_Type if (newObject == NULL || isExistingOp) { if (isExistingOp) KMessageBox::error( - kapp -> mainWidget(), + tdeApp -> mainWidget(), i18n( "The name you entered was not unique!\nCreation process has been canceled." ), i18n( "Name Not Unique" ) ); m_bCreatingChildObject = false; @@ -2666,7 +2666,7 @@ bool UMLListView::deleteItem(UMLListViewItem *temp) { UMLObjectList contained = nmSpc->containedObjects(); if (contained.count()) { KMessageBox::error( - kapp->mainWidget(), + tdeApp->mainWidget(), i18n("The folder must be emptied before it can be deleted."), i18n("Folder Not Empty")); return false; diff --git a/umbrello/umbrello/umllistviewitem.cpp b/umbrello/umbrello/umllistviewitem.cpp index f5408e14..45fe7e7c 100644 --- a/umbrello/umbrello/umllistviewitem.cpp +++ b/umbrello/umbrello/umllistviewitem.cpp @@ -367,7 +367,7 @@ void UMLListViewItem::okRename( int col ) { } m_Label = op->toString(Uml::st_SigNoVis); } else { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Rename canceled") ); } @@ -401,7 +401,7 @@ void UMLListViewItem::okRename( int col ) { pAtt->setInitialValue(nt.m_initialValue); m_Label = pAtt->toString(Uml::st_SigNoVis); } else { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Rename canceled") ); } @@ -429,7 +429,7 @@ void UMLListViewItem::okRename( int col ) { tmpl->setType(nt.m_type); m_Label = tmpl->toString(Uml::st_SigNoVis); } else { - KMessageBox::error( kapp->mainWidget(), + KMessageBox::error( tdeApp->mainWidget(), Model_Utils::psText(st), i18n("Rename canceled") ); } @@ -464,7 +464,7 @@ void UMLListViewItem::okRename( int col ) { break; } default: - KMessageBox::error( kapp->mainWidget() , + KMessageBox::error( tdeApp->mainWidget() , i18n("Renaming an item of listview type %1 is not yet implemented.").arg(m_Type), i18n("Function Not Implemented") ); TQListViewItem::setText(0, m_Label); @@ -474,7 +474,7 @@ void UMLListViewItem::okRename( int col ) { } void UMLListViewItem::cancelRenameWithMsg() { - KMessageBox::error( kapp->mainWidget() , + KMessageBox::error( tdeApp->mainWidget() , i18n("The name you entered was invalid.\nRenaming process has been canceled."), i18n("Name Not Valid") ); TQListViewItem::setText(0, m_Label); diff --git a/umbrello/umbrello/umlobject.cpp b/umbrello/umbrello/umlobject.cpp index 9eb12766..da22b3e6 100644 --- a/umbrello/umbrello/umlobject.cpp +++ b/umbrello/umbrello/umlobject.cpp @@ -454,7 +454,7 @@ bool UMLObject::resolveRef() { if (m_pSecondary) { if (Import_Utils::newUMLObjectWasCreated()) { maybeSignalObjectCreated(); - kapp->processEvents(); + tdeApp->processEvents(); kDebug() << "UMLObject::resolveRef: Import_Utils::createUMLObject() " << "created a new type for " << m_SecondaryId << endl; } else { @@ -486,7 +486,7 @@ bool UMLObject::resolveRef() { return false; m_SecondaryId = ""; maybeSignalObjectCreated(); - //kapp->processEvents(); + //tdeApp->processEvents(); return true; } diff --git a/umbrello/umbrello/umlrole.cpp b/umbrello/umbrello/umlrole.cpp index ca33dffb..e21bf458 100644 --- a/umbrello/umbrello/umlrole.cpp +++ b/umbrello/umbrello/umlrole.cpp @@ -98,7 +98,7 @@ void UMLRole::init(UMLAssociation * parent, UMLObject * parentObj, Uml::Role_Typ m_Changeability = Uml::chg_Changeable; // connect this up to parent - connect(this,TQT_SIGNAL(modified()),parent,TQT_SIGNAL(modified())); + connect(this,TQ_SIGNAL(modified()),parent,TQ_SIGNAL(modified())); } void UMLRole::saveToXMI( TQDomDocument & qDoc, TQDomElement & qElement ) { diff --git a/umbrello/umbrello/umlview.cpp b/umbrello/umbrello/umlview.cpp index b6118424..c8a20982 100644 --- a/umbrello/umbrello/umlview.cpp +++ b/umbrello/umbrello/umlview.cpp @@ -166,9 +166,9 @@ void UMLView::init() { viewport() -> setMouseTracking(false); //setup signals - connect( this, TQT_SIGNAL(sigRemovePopupMenu()), this, TQT_SLOT(slotRemovePopupMenu() ) ); - connect( UMLApp::app(), TQT_SIGNAL( sigCutSuccessful() ), - this, TQT_SLOT( slotCutSuccessful() ) ); + connect( this, TQ_SIGNAL(sigRemovePopupMenu()), this, TQ_SLOT(slotRemovePopupMenu() ) ); + connect( UMLApp::app(), TQ_SIGNAL( sigCutSuccessful() ), + this, TQ_SLOT( slotCutSuccessful() ) ); // Create the ToolBarState factory. This class is not a singleton, because it // needs a pointer to this object. @@ -406,14 +406,14 @@ void UMLView::showEvent(TQShowEvent* /*se*/) { UMLApp* theApp = UMLApp::app(); WorkToolBar* tb = theApp->getWorkToolBar(); - connect(tb,TQT_SIGNAL(sigButtonChanged(int)), this, TQT_SLOT(slotToolBarChanged(int))); - connect(this,TQT_SIGNAL(sigResetToolBar()), tb, TQT_SLOT(slotResetToolBar())); - connect(m_pDoc, TQT_SIGNAL(sigObjectCreated(UMLObject *)), - this, TQT_SLOT(slotObjectCreated(UMLObject *))); - connect(this, TQT_SIGNAL(sigAssociationRemoved(AssociationWidget*)), - UMLApp::app()->getDocWindow(), TQT_SLOT(slotAssociationRemoved(AssociationWidget*))); - connect(this, TQT_SIGNAL(sigWidgetRemoved(UMLWidget*)), - UMLApp::app()->getDocWindow(), TQT_SLOT(slotWidgetRemoved(UMLWidget*))); + connect(tb,TQ_SIGNAL(sigButtonChanged(int)), this, TQ_SLOT(slotToolBarChanged(int))); + connect(this,TQ_SIGNAL(sigResetToolBar()), tb, TQ_SLOT(slotResetToolBar())); + connect(m_pDoc, TQ_SIGNAL(sigObjectCreated(UMLObject *)), + this, TQ_SLOT(slotObjectCreated(UMLObject *))); + connect(this, TQ_SIGNAL(sigAssociationRemoved(AssociationWidget*)), + UMLApp::app()->getDocWindow(), TQ_SLOT(slotAssociationRemoved(AssociationWidget*))); + connect(this, TQ_SIGNAL(sigWidgetRemoved(UMLWidget*)), + UMLApp::app()->getDocWindow(), TQ_SLOT(slotWidgetRemoved(UMLWidget*))); resetToolbar(); } @@ -421,13 +421,13 @@ void UMLView::showEvent(TQShowEvent* /*se*/) { void UMLView::hideEvent(TQHideEvent* /*he*/) { UMLApp* theApp = UMLApp::app(); WorkToolBar* tb = theApp->getWorkToolBar(); - disconnect(tb,TQT_SIGNAL(sigButtonChanged(int)), this, TQT_SLOT(slotToolBarChanged(int))); - disconnect(this,TQT_SIGNAL(sigResetToolBar()), tb, TQT_SLOT(slotResetToolBar())); - disconnect(m_pDoc, TQT_SIGNAL(sigObjectCreated(UMLObject *)), this, TQT_SLOT(slotObjectCreated(UMLObject *))); - disconnect(this, TQT_SIGNAL(sigAssociationRemoved(AssociationWidget*)), - UMLApp::app()->getDocWindow(), TQT_SLOT(slotAssociationRemoved(AssociationWidget*))); - disconnect(this, TQT_SIGNAL(sigWidgetRemoved(UMLWidget*)), - UMLApp::app()->getDocWindow(), TQT_SLOT(slotWidgetRemoved(UMLWidget*))); + disconnect(tb,TQ_SIGNAL(sigButtonChanged(int)), this, TQ_SLOT(slotToolBarChanged(int))); + disconnect(this,TQ_SIGNAL(sigResetToolBar()), tb, TQ_SLOT(slotResetToolBar())); + disconnect(m_pDoc, TQ_SIGNAL(sigObjectCreated(UMLObject *)), this, TQ_SLOT(slotObjectCreated(UMLObject *))); + disconnect(this, TQ_SIGNAL(sigAssociationRemoved(AssociationWidget*)), + UMLApp::app()->getDocWindow(), TQ_SLOT(slotAssociationRemoved(AssociationWidget*))); + disconnect(this, TQ_SIGNAL(sigWidgetRemoved(UMLWidget*)), + UMLApp::app()->getDocWindow(), TQ_SLOT(slotWidgetRemoved(UMLWidget*))); # ifdef MANUAL_CONTROL_DOUBLE_BUFFERING //kWarning() << "Hide Event for " << getName() << endl; @@ -815,9 +815,9 @@ void UMLView::removeWidget(UMLWidget * o) { o -> cleanup(); m_SelectedList.remove(o); - disconnect( this, TQT_SIGNAL( sigRemovePopupMenu() ), o, TQT_SLOT( slotRemovePopupMenu() ) ); - disconnect( this, TQT_SIGNAL( sigClearAllSelected() ), o, TQT_SLOT( slotClearAllSelected() ) ); - disconnect( this, TQT_SIGNAL(sigColorChanged(Uml::IDType)), o, TQT_SLOT(slotColorChanged(Uml::IDType))); + disconnect( this, TQ_SIGNAL( sigRemovePopupMenu() ), o, TQ_SLOT( slotRemovePopupMenu() ) ); + disconnect( this, TQ_SIGNAL( sigClearAllSelected() ), o, TQ_SLOT( slotClearAllSelected() ) ); + disconnect( this, TQ_SIGNAL(sigColorChanged(Uml::IDType)), o, TQ_SLOT(slotColorChanged(Uml::IDType))); if (t == wt_Message) m_MessageList.remove(static_cast<MessageWidget*>(o)); else @@ -2364,14 +2364,14 @@ void UMLView::setMenu() { }//end switch if( menu != ListPopupMenu::mt_Undefined ) { m_pMenu = new ListPopupMenu(this, menu, this); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); m_pMenu->popup( mapToGlobal( contentsToViewport(worldMatrix().map(m_Pos)) ) ); } } void UMLView::slotRemovePopupMenu() { if(m_pMenu) { - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } diff --git a/umbrello/umbrello/umlviewcanvas.cpp b/umbrello/umbrello/umlviewcanvas.cpp index a505b0bd..e75d711b 100644 --- a/umbrello/umbrello/umlviewcanvas.cpp +++ b/umbrello/umbrello/umlviewcanvas.cpp @@ -19,7 +19,7 @@ #include "umlview.h" -UMLViewCanvas::UMLViewCanvas( UMLView * pView ) : TQCanvas( TQT_TQOBJECT(pView) ) { +UMLViewCanvas::UMLViewCanvas( UMLView * pView ) : TQCanvas( pView ) { m_pView = pView; } diff --git a/umbrello/umbrello/umlviewimageexportermodel.cpp b/umbrello/umbrello/umlviewimageexportermodel.cpp index 2c45bb04..ada8f91c 100644 --- a/umbrello/umbrello/umlviewimageexportermodel.cpp +++ b/umbrello/umbrello/umlviewimageexportermodel.cpp @@ -170,7 +170,7 @@ TQString UMLViewImageExporterModel::getDiagramFileName(UMLView *view, const TQSt return name; } - kapp->processEvents(); + tdeApp->processEvents(); UMLListView *listView = UMLApp::app()->getListView(); UMLListViewItem* listViewItem = listView->findItem(view->getID()); // skip the name of the first item because it's the View diff --git a/umbrello/umbrello/umlwidget.cpp b/umbrello/umbrello/umlwidget.cpp index 6d69fb1d..3f77a6ec 100644 --- a/umbrello/umbrello/umlwidget.cpp +++ b/umbrello/umbrello/umlwidget.cpp @@ -53,7 +53,7 @@ UMLWidget::UMLWidget( UMLView * view, UMLObject * o, UMLWidgetController *widget init(); m_pObject = o; if(m_pObject) { - connect( m_pObject, TQT_SIGNAL(modified()), this, TQT_SLOT(updateWidget()) ); + connect( m_pObject, TQ_SIGNAL(modified()), this, TQ_SLOT(updateWidget()) ); m_nId = m_pObject->getID(); } } @@ -234,14 +234,14 @@ void UMLWidget::init() { m_pMenu = 0; m_pDoc = UMLApp::app()->getDocument(); m_nPosX = 0; - connect( m_pView, TQT_SIGNAL( sigRemovePopupMenu() ), this, TQT_SLOT( slotRemovePopupMenu() ) ); - connect( m_pView, TQT_SIGNAL( sigClearAllSelected() ), this, TQT_SLOT( slotClearAllSelected() ) ); + connect( m_pView, TQ_SIGNAL( sigRemovePopupMenu() ), this, TQ_SLOT( slotRemovePopupMenu() ) ); + connect( m_pView, TQ_SIGNAL( sigClearAllSelected() ), this, TQ_SLOT( slotClearAllSelected() ) ); - connect( m_pView, TQT_SIGNAL(sigColorChanged(Uml::IDType)), this, TQT_SLOT(slotColorChanged(Uml::IDType))); - connect( m_pView, TQT_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQT_SLOT(slotLineWidthChanged(Uml::IDType))); + connect( m_pView, TQ_SIGNAL(sigColorChanged(Uml::IDType)), this, TQ_SLOT(slotColorChanged(Uml::IDType))); + connect( m_pView, TQ_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQ_SLOT(slotLineWidthChanged(Uml::IDType))); - // connect( m_pView, TQT_SIGNAL(sigColorChanged(int)), this, TQT_SLOT(slotColorChanged(int))); + // connect( m_pView, TQ_SIGNAL(sigColorChanged(int)), this, TQ_SLOT(slotColorChanged(int))); m_pObject = NULL; setZ(m_origZ = 2); // default for most widgets } @@ -637,12 +637,12 @@ void UMLWidget::startPopupMenu( const TQPoint &At) { m_pMenu->popup(At); - connect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + connect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); } void UMLWidget::slotRemovePopupMenu() { if(m_pMenu) { - disconnect(m_pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuSelection(int))); + disconnect(m_pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuSelection(int))); delete m_pMenu; m_pMenu = 0; } @@ -723,15 +723,15 @@ void UMLWidget::slotClearAllSelected() void UMLWidget::setView(UMLView * v) { //remove signals from old view - was probably 0 anyway - disconnect( m_pView, TQT_SIGNAL( sigRemovePopupMenu() ), this, TQT_SLOT( slotRemovePopupMenu() ) ); - disconnect( m_pView, TQT_SIGNAL( sigClearAllSelected() ), this, TQT_SLOT( slotClearAllSelected() ) ); - disconnect( m_pView, TQT_SIGNAL(sigColorChanged(Uml::IDType)), this, TQT_SLOT(slotColorChanged(Uml::IDType))); - disconnect( m_pView, TQT_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQT_SLOT(slotLineWidthChanged(Uml::IDType))); + disconnect( m_pView, TQ_SIGNAL( sigRemovePopupMenu() ), this, TQ_SLOT( slotRemovePopupMenu() ) ); + disconnect( m_pView, TQ_SIGNAL( sigClearAllSelected() ), this, TQ_SLOT( slotClearAllSelected() ) ); + disconnect( m_pView, TQ_SIGNAL(sigColorChanged(Uml::IDType)), this, TQ_SLOT(slotColorChanged(Uml::IDType))); + disconnect( m_pView, TQ_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQ_SLOT(slotLineWidthChanged(Uml::IDType))); m_pView = v; - connect( m_pView, TQT_SIGNAL( sigRemovePopupMenu() ), this, TQT_SLOT( slotRemovePopupMenu() ) ); - connect( m_pView, TQT_SIGNAL( sigClearAllSelected() ), this, TQT_SLOT( slotClearAllSelected() ) ); - connect( m_pView, TQT_SIGNAL(sigColorChanged(Uml::IDType)), this, TQT_SLOT(slotColorChanged(Uml::IDType))); - connect( m_pView, TQT_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQT_SLOT(slotLineWidthChanged(Uml::IDType))); + connect( m_pView, TQ_SIGNAL( sigRemovePopupMenu() ), this, TQ_SLOT( slotRemovePopupMenu() ) ); + connect( m_pView, TQ_SIGNAL( sigClearAllSelected() ), this, TQ_SLOT( slotClearAllSelected() ) ); + connect( m_pView, TQ_SIGNAL(sigColorChanged(Uml::IDType)), this, TQ_SLOT(slotColorChanged(Uml::IDType))); + connect( m_pView, TQ_SIGNAL(sigLineWidthChanged(Uml::IDType)), this, TQ_SLOT(slotLineWidthChanged(Uml::IDType))); } void UMLWidget::setX( int x ) { diff --git a/umbrello/umbrello/uniqueid.cpp b/umbrello/umbrello/uniqueid.cpp index 98685229..334bfdfc 100644 --- a/umbrello/umbrello/uniqueid.cpp +++ b/umbrello/umbrello/uniqueid.cpp @@ -28,7 +28,7 @@ Uml::IDType gen() { int i = 0; // Source: KDE4 tdelibs/tdecore/krandom.cpp KRandom::randomString() while (length--) { - int r = kapp->random() % 62; + int r = tdeApp->random() % 62; r += 48; if (r > 57) r += 7; diff --git a/umbrello/umbrello/worktoolbar.cpp b/umbrello/umbrello/worktoolbar.cpp index 66cc931a..7c226d6d 100644 --- a/umbrello/umbrello/worktoolbar.cpp +++ b/umbrello/umbrello/worktoolbar.cpp @@ -16,7 +16,7 @@ #include <tqmainwindow.h> #include <kdebug.h> #include <tdelocale.h> -#include <kstandarddirs.h> +#include <tdestandarddirs.h> #include <tdetoolbarbutton.h> // application specific includes @@ -44,11 +44,11 @@ WorkToolBar::WorkToolBar(TQMainWindow *parentWindow, const char*name) m_map.insert(Uml::dt_Undefined,tbb_Arrow); slotCheckToolBar( Uml::dt_Undefined ); - connect( this, TQT_SIGNAL( released( int ) ), this, TQT_SLOT( buttonChanged (int ) ) ); + connect( this, TQ_SIGNAL( released( int ) ), this, TQ_SLOT( buttonChanged (int ) ) ); } WorkToolBar::~WorkToolBar() { - disconnect(this, TQT_SIGNAL(released(int)),this,TQT_SLOT(buttonChanged(int))); + disconnect(this, TQ_SIGNAL(released(int)),this,TQ_SLOT(buttonChanged(int))); } void WorkToolBar::insertHotBtn(ToolBar_Buttons tbb) { diff --git a/umbrello/uml.kdevprj b/umbrello/uml.kdevprj deleted file mode 100644 index fec9f43e..00000000 --- a/umbrello/uml.kdevprj +++ /dev/null @@ -1,2154 +0,0 @@ -[Config for BinMakefileAm] -addcxxflags= -bin_program=umbrello -cflags= -cppflags= -cxxflags=\s-O0 -g3 -Wall -ldadd=-lfl $(LIB_TDEPRINT) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TQT) -ldflags=\s -Iuml/classparser -Iuml/dialogs -Iuml/clipboard - -[General] -AMChanged=true -author=Umbrello UML Modeller Authors -configure_args=\s--build=i386-linux --host=i386-linux --target=i386-linux --prefix=/opt/trinity --enable-debug\s -email=uml-devel@lists.sourceforge.net -kdevprj_version=1.3 -lfv_open_groups= -make_options=\s-j1 -makefiles=uml.spec.in,Makefile.am,uml/Makefile.am,doc/Makefile.am,doc/en/Makefile.am,po/Makefile.am,uml/classparser/Makefile.am,uml/clipboard/Makefile.am,uml/dialogs/Makefile.am,uml/pics/Makefile.am,doc/en/pics/Makefile.am,uml/codegenerators/Makefile.am,uml/headings/Makefile.am,doc/de/Makefile.am,doc/de/pics/Makefile.am -modifyMakefiles=true -project_name=Umbrello -project_type=normal_kde2 -short_info=Umbrello UML Modeller -showNonProjectFiles=true -sub_dir=uml/ -version=1.1rc1 -version_control=CVS -workspace=1 - -[KPP] -kpp_appgrp= -kpp_bldroot= -kpp_icon=0 -kpp_license=5 -kpp_summary= -kpp_url= -kpp_version=1.1 - -[LFV Groups] -Headers=*.h,*.hh,*.hxx,*.hpp,*.H -Others=* -Sources=*.cpp,*.c,*.cc,*.C,*.cxx,*.ec,*.ecpp,*.lxx,*.l++,*.ll,*.l -Translations=*.po -User Interface=*.kdevdlg,*.ui,*.rc,*.dlg -groups=Headers,Sources,User Interface,Translations,Others - -[Makefile.am] -files=uml.kdevprj,admin,uml.spec.in -sub_dirs=uml,po,doc -type=normal - -[admin] -dist=true -install=false -install_location= -type=DATA - -[doc/Makefile.am] -sub_dirs=en,de -type=normal - -[doc/de/Makefile.am] -files=doc/de/authors.docbook,doc/de/code_import_and_generation.docbook,doc/de/faq.docbook,doc/de/index.docbook,doc/de/installation.docbook,doc/de/introduction.docbook,doc/de/working_with_umbrello.docbook,doc/de/menu_reference.docbook,doc/de/other_features.docbook,doc/de/uml_basics.docbook -sub_dirs=pics -type=normal - -[doc/de/authors.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/de/code_import_and_generation.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/de/faq.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/de/index.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/de/installation.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/de/introduction.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/de/menu_reference.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/de/other_features.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/de/pics/Makefile.am] -files=doc/de/pics/activity-diagram.png,doc/de/pics/add-remove-languages.png,doc/de/pics/aggregation.png,doc/de/pics/association.png,doc/de/pics/class-diagram.png,doc/de/pics/class.png,doc/de/pics/code-import.png,doc/de/pics/collaboration-diagram.png,doc/de/pics/composition.png,doc/de/pics/folders.png,doc/de/pics/generalization.png,doc/de/pics/generation-options.png,doc/de/pics/sequence-diagram.png,doc/de/pics/state-diagram.png,doc/de/pics/umbrello-main-screen.png,doc/de/pics/umbrello-ui-clean.png,doc/de/pics/umbrello-ui.png,doc/de/pics/use-case-diagram.png -sub_dirs= -type=normal - -[doc/de/pics/activity-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/activity-diagram.png -type=DATA - -[doc/de/pics/add-remove-languages.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/add-remove-languages.png -type=DATA - -[doc/de/pics/aggregation.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/aggregation.png -type=DATA - -[doc/de/pics/association.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/association.png -type=DATA - -[doc/de/pics/class-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/class-diagram.png -type=DATA - -[doc/de/pics/class.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/class.png -type=DATA - -[doc/de/pics/code-import.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/code-import.png -type=DATA - -[doc/de/pics/collaboration-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/collaboration-diagram.png -type=DATA - -[doc/de/pics/composition.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/composition.png -type=DATA - -[doc/de/pics/folders.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/folders.png -type=DATA - -[doc/de/pics/generalization.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/generalization.png -type=DATA - -[doc/de/pics/generation-options.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/generation-options.png -type=DATA - -[doc/de/pics/sequence-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/sequence-diagram.png -type=DATA - -[doc/de/pics/state-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/state-diagram.png -type=DATA - -[doc/de/pics/umbrello-main-screen.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/umbrello-main-screen.png -type=DATA - -[doc/de/pics/umbrello-ui-clean.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/umbrello-ui-clean.png -type=DATA - -[doc/de/pics/umbrello-ui.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/umbrello-ui.png -type=DATA - -[doc/de/pics/use-case-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/de/umbrello/pics/use-case-diagram.png -type=DATA - -[doc/de/uml_basics.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/de/working_with_umbrello.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/en/Makefile.am] -files=doc/en/index.docbook,doc/en/introduction.docbook,doc/en/uml_basics.docbook,doc/en/installation.docbook,doc/en/faq.docbook,doc/en/menu_reference.docbook,doc/en/code_import_and_generation.docbook,doc/en/authors.docbook,doc/en/error_msgs.docbook,doc/en/working_with_umbrello.docbook,doc/en/other_features.docbook -sub_dirs=pics -type=normal - -[doc/en/authors.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/en/code_import_and_generation.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/en/error_msgs.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/en/faq.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/en/index.docbook] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/index.docbook -type=DATA - -[doc/en/installation.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/en/introduction.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/en/menu_reference.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/en/other_features.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/en/pics/Makefile.am] -files=doc/en/pics/add-remove-languages.png,doc/en/pics/aggregation.png,doc/en/pics/association.png,doc/en/pics/class-diagram.png,doc/en/pics/class.png,doc/en/pics/code-import.png,doc/en/pics/collaboration-diagram.png,doc/en/pics/composition.png,doc/en/pics/folders.png,doc/en/pics/generalization.png,doc/en/pics/generation-options.png,doc/en/pics/sequence-diagram.png,doc/en/pics/state-diagram.png,doc/en/pics/umbrello-main-screen.png,doc/en/pics/umbrello-ui.png,doc/en/pics/umbrello-ui-clean.png,doc/en/pics/activity-diagram.png,doc/en/pics/use-case-diagram.png -sub_dirs= -type=normal - -[doc/en/pics/activity-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/activity-diagram.png -type=DATA - -[doc/en/pics/add-remove-languages.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/add-remove-languages.png -type=DATA - -[doc/en/pics/aggregation.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/aggregation.png -type=DATA - -[doc/en/pics/association.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/association.png -type=DATA - -[doc/en/pics/class-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/class-diagram.png -type=DATA - -[doc/en/pics/class.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/class.png -type=DATA - -[doc/en/pics/code-import.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/code-import.png -type=DATA - -[doc/en/pics/collaboration-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/collaboration-diagram.png -type=DATA - -[doc/en/pics/composition.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/composition.png -type=DATA - -[doc/en/pics/folders.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/folders.png -type=DATA - -[doc/en/pics/generalization.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/generalization.png -type=DATA - -[doc/en/pics/generation-options.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/generation-options.png -type=DATA - -[doc/en/pics/sequence-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/sequence-diagram.png -type=DATA - -[doc/en/pics/state-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/state-diagram.png -type=DATA - -[doc/en/pics/umbrello-main-screen.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/umbrello-main-screen.png -type=DATA - -[doc/en/pics/umbrello-ui-clean.png] -dist=true -install=false -install_location= -type=DATA - -[doc/en/pics/umbrello-ui.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/umbrello-ui.png -type=DATA - -[doc/en/pics/use-case-diagram.png] -dist=true -install=true -install_location=$$(kde_htmldir)/en/umbrello/pics/use-case-diagram.png -type=DATA - -[doc/en/uml_basics.docbook] -dist=true -install=false -install_location= -type=DATA - -[doc/en/working_with_umbrello.docbook] -dist=true -install=false -install_location= -type=DATA - -[po/Makefile.am] -sub_dirs= -type=po - -[uml.kdevprj] -dist=true -install=false -install_location= -type=DATA - -[uml.spec.in] -dist=true -install=false -install_location= -type=DATA - -[uml/Makefile.am] -files=uml/actor.h,uml/actorwidgetdata.h,uml/actorwidget.h,uml/associationwidgetdata.h,uml/associationwidgetdatalist.h,uml/associationwidget.h,uml/assocrules.h,uml/attribute.h,uml/concept.h,uml/conceptwidgetdata.h,uml/conceptwidget.h,uml/docwindow.h,uml/floatingtextdata.h,uml/floatingtext.h,uml/infowidget.h,uml/kstartuplogo.h,uml/linepath.h,uml/listpopupmenu.h,uml/messagewidgetdata.h,uml/messagewidget.h,uml/actor.cpp,uml/actorwidget.cpp,uml/actorwidgetdata.cpp,uml/associationwidget.cpp,uml/associationwidgetdata.cpp,uml/assocrules.cpp,uml/attribute.cpp,uml/concept.cpp,uml/conceptwidget.cpp,uml/conceptwidgetdata.cpp,uml/docwindow.cpp,uml/floatingtext.cpp,uml/floatingtextdata.cpp,uml/infowidget.cpp,uml/kstartuplogo.cpp,uml/linepath.cpp,uml/listpopupmenu.cpp,uml/main.cpp,uml/messagewidget.cpp,uml/messagewidgetdata.cpp,uml/notewidget.cpp,uml/notewidgetdata.cpp,uml/notewidgetdata.h,uml/notewidget.h,uml/objectwidget.cpp,uml/objectwidgetdata.cpp,uml/objectwidgetdata.h,uml/objectwidget.h,uml/operation.cpp,uml/operation.h,uml/statewidget.cpp,uml/statewidgetdata.cpp,uml/statewidgetdata.h,uml/statewidget.h,uml/uml.cpp,uml/umldoc.cpp,uml/umldoc.h,uml/uml.h,uml/umlnamespace.cpp,uml/umlnamespace.h,uml/umlobject.cpp,uml/umlobject.h,uml/umlobjectlist.h,uml/umlviewcanvas.cpp,uml/umlviewcanvas.h,uml/umlview.cpp,uml/umlviewdata.cpp,uml/umlviewdata.h,uml/umlview.h,uml/umlviewlist.h,uml/umlwidget.cpp,uml/umlwidgetdata.cpp,uml/umlwidgetdata.h,uml/umlwidget.h,uml/umlwidgetlist.h,uml/usecase.cpp,uml/usecase.h,uml/usecasewidget.cpp,uml/usecasewidgetdata.cpp,uml/usecasewidgetdata.h,uml/usecasewidget.h,uml/worktoolbar.cpp,uml/worktoolbar.h,uml/hi16-app-uml.png,uml/hi32-app-uml.png,uml/lo16-app-uml.png,uml/lo32-app-uml.png,uml/tips,uml/uml.desktop,uml/umlui.rc,uml/x-uml.desktop,uml/activitywidgetdata.cpp,uml/activitywidgetdata.h,uml/activitywidget.cpp,uml/activitywidget.h,uml/codegenerator.cpp,uml/codegenerator.h,uml/seqlinewidget.cpp,uml/seqlinewidget.h,uml/umllistview.cpp,uml/umllistview.h,uml/umllistviewitem.cpp,uml/umllistviewitem.h,uml/umllistviewitemdata.cpp,uml/umllistviewitemdata.h,uml/umllistviewitemdatalist.h,uml/classimport.cpp,uml/classimport.h,uml/umllistviewitemlist.h -sub_dirs=classparser,clipboard,dialogs,pics,codegenerators,headings -type=prog_main - -[uml/activitywidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/activitywidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/activitywidgetdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/activitywidgetdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/actor.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/actor.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/actorwidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/actorwidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/actorwidgetdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/actorwidgetdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/associationwidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/associationwidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/associationwidgetdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/associationwidgetdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/associationwidgetdatalist.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/assocrules.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/assocrules.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/attribute.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/attribute.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classimport.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classimport.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ClassParser.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ClassParser.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ClassStore.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ClassStore.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ClassTreeNode.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ClassTreeNode.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/Makefile.am] -files=uml/classparser/ClassParser.h,uml/classparser/ClassStore.h,uml/classparser/ClassTreeNode.h,uml/classparser/ParsedArgument.h,uml/classparser/ParsedAttribute.h,uml/classparser/ParsedClassContainer.h,uml/classparser/ParsedClass.h,uml/classparser/ParsedContainer.h,uml/classparser/ParsedItem.h,uml/classparser/ParsedMethod.h,uml/classparser/ParsedParent.h,uml/classparser/ParsedScopeContainer.h,uml/classparser/ParsedSignalSlot.h,uml/classparser/ParsedStruct.h,uml/classparser/PersistantClassStore.h,uml/classparser/ProgrammingByContract.h,uml/classparser/tokenizer.h,uml/classparser/ClassParser.cc,uml/classparser/ClassStore.cc,uml/classparser/ClassTreeNode.cc,uml/classparser/ParsedArgument.cc,uml/classparser/ParsedAttribute.cc,uml/classparser/ParsedClass.cc,uml/classparser/ParsedClassContainer.cc,uml/classparser/ParsedContainer.cc,uml/classparser/ParsedItem.cc,uml/classparser/ParsedMethod.cc,uml/classparser/ParsedParent.cc,uml/classparser/ParsedScopeContainer.cc,uml/classparser/ParsedSignalSlot.cc,uml/classparser/ParsedStruct.cc,uml/classparser/PersistantClassStore.cc,uml/classparser/tokenizer.cc -sharedlib_LDFLAGS= -sharedlib_rootname= -sub_dirs= -type=static_library - -[uml/classparser/ParsedArgument.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ParsedArgument.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ParsedAttribute.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ParsedAttribute.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ParsedClass.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ParsedClass.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ParsedClassContainer.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ParsedClassContainer.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ParsedContainer.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ParsedContainer.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ParsedItem.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ParsedItem.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ParsedMethod.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ParsedMethod.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ParsedParent.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ParsedParent.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ParsedScopeContainer.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ParsedScopeContainer.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ParsedSignalSlot.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ParsedSignalSlot.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ParsedStruct.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/ParsedStruct.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/PersistantClassStore.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/PersistantClassStore.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/ProgrammingByContract.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/classparser/tokenizer.cc] -dist=true -install=false -install_location= -type=SOURCE - -[uml/classparser/tokenizer.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/clipboard/Makefile.am] -files=uml/clipboard/idchangelog.cpp,uml/clipboard/idchangelog.h,uml/clipboard/umlclipboard.cpp,uml/clipboard/umlclipboard.h,uml/clipboard/umldrag.cpp,uml/clipboard/umldrag.h -sharedlib_LDFLAGS=-version-info 0:0:0 -sharedlib_rootname=clipboard -sub_dirs= -type=static_library - -[uml/clipboard/idchangelog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/clipboard/idchangelog.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/clipboard/umlclipboard.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/clipboard/umlclipboard.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/clipboard/umldrag.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/clipboard/umldrag.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/codegenerator.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/codegenerator.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/codegenerators/Makefile.am] -files=uml/codegenerators/cppwriter.cpp,uml/codegenerators/cppwriter.h,uml/codegenerators/factory.cpp,uml/codegenerators/javawriter.cpp,uml/codegenerators/javawriter.h,uml/codegenerators/phpwriter.cpp,uml/codegenerators/phpwriter.h -sharedlib_LDFLAGS=-module -sharedlib_rootname=codegenerator -sub_dirs= -type=shared_library - -[uml/codegenerators/cppwriter.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/codegenerators/cppwriter.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/codegenerators/factory.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/codegenerators/javawriter.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/codegenerators/javawriter.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/codegenerators/phpwriter.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/codegenerators/phpwriter.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/concept.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/concept.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/conceptwidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/conceptwidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/conceptwidgetdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/conceptwidgetdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/Makefile.am] -files=uml/dialogs/assocpage.cpp,uml/dialogs/assocpage.h,uml/dialogs/assocpropdlg.cpp,uml/dialogs/assocpropdlg.h,uml/dialogs/classattpage.cpp,uml/dialogs/classattpage.h,uml/dialogs/classgenpage.cpp,uml/dialogs/classgenpage.h,uml/dialogs/classopspage.cpp,uml/dialogs/classopspage.h,uml/dialogs/classoptionspage.cpp,uml/dialogs/classoptionspage.h,uml/dialogs/classpropdlg.cpp,uml/dialogs/classpropdlg.h,uml/dialogs/diagramprintpage.cpp,uml/dialogs/diagramprintpage.h,uml/dialogs/parmpropdlg.cpp,uml/dialogs/parmpropdlg.h,uml/dialogs/selectopdlg.cpp,uml/dialogs/selectopdlg.h,uml/dialogs/settingsdlg.cpp,uml/dialogs/settingsdlg.h,uml/dialogs/statedialog.cpp,uml/dialogs/statedialog.h,uml/dialogs/umlattributedialog.h,uml/dialogs/umloperationdialog.h,uml/dialogs/umlviewdialog.h,uml/dialogs/umlwidgetcolorpage.h,uml/dialogs/umlattributedialog.cpp,uml/dialogs/umloperationdialog.cpp,uml/dialogs/umlviewdialog.cpp,uml/dialogs/umlwidgetcolorpage.cpp,uml/dialogs/activitypage.cpp,uml/dialogs/activitypage.h,uml/dialogs/activitydialog.cpp,uml/dialogs/activitydialog.h,uml/dialogs/notedialog.cpp,uml/dialogs/notedialog.h,uml/dialogs/configcodegenerators.cpp,uml/dialogs/configcodegenerators.h,uml/dialogs/configgeneratorsbase.ui,uml/dialogs/classwizard.cpp,uml/dialogs/classwizard.h,uml/dialogs/sellanguagesbase.ui,uml/dialogs/selectlanguagesdlg.cpp,uml/dialogs/selectlanguagesdlg.h,uml/dialogs/codegenerationoptionsbase.ui,uml/dialogs/codegenerationwizardbase.ui,uml/dialogs/codegenerationoptionspage.cpp,uml/dialogs/codegenerationoptionspage.h,uml/dialogs/codegenerationwizard.cpp,uml/dialogs/codegenerationwizard.h,uml/dialogs/overwritedialogue.cpp,uml/dialogs/overwritedialogue.h -sharedlib_LDFLAGS=-version-info 0:0:0 -sharedlib_rootname=dialogs -sub_dirs= -type=static_library - -[uml/dialogs/activitydialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/activitydialog.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/activitypage.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/activitypage.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/assocpage.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/assocpage.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/assocpropdlg.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/assocpropdlg.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/classattpage.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/classattpage.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/classgenpage.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/classgenpage.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/classopspage.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/classopspage.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/classoptionspage.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/classoptionspage.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/classpropdlg.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/classpropdlg.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/classselectionpage.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/classselectionpage.h] -dist=false -install=false -install_location= -type=HEADER - -[uml/dialogs/classwizard.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/classwizard.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/codegenerationoptionsbase.ui] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/codegenerationoptionspage.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/codegenerationoptionspage.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/codegenerationwizard.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/codegenerationwizard.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/codegenerationwizardbase.ui] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/codegenwizard.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/codegenwizard.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/codeoptionspage.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/codeoptionspage.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/configcodegenerators.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/configcodegenerators.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/configgeneratorsbase.ui] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/diagramprintpage.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/diagramprintpage.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/notedialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/notedialog.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/overwritedialogue.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/overwritedialogue.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/parmpropdlg.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/parmpropdlg.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/selectlanguagesdlg.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/selectlanguagesdlg.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/selectopdlg.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/selectopdlg.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/sellanguagesbase.ui] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/settingsdlg.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/settingsdlg.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/statedialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/statedialog.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/umlattributedialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/umlattributedialog.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/umloperationdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/umloperationdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/umlviewdialog.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/umlviewdialog.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/dialogs/umlwidgetcolorpage.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/dialogs/umlwidgetcolorpage.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/docwindow.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/docwindow.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/floatingtext.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/floatingtext.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/floatingtextdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/floatingtextdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/headings/Makefile.am] -files=uml/headings/heading.java,uml/headings/heading.h,uml/headings/template.cpp,uml/headings/heading.php,uml/headings/heading.cpp -sub_dirs= -type=normal - -[uml/headings/heading.cpp] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/headings/heading.cpp -type=SOURCE - -[uml/headings/heading.h] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/headings/heading.h -type=DATA - -[uml/headings/heading.java] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/headings/heading.java -type=DATA - -[uml/headings/heading.php] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/headings/heading.php -type=DATA - -[uml/headings/template.cpp] -dist=false -install=false -install_location=$$(kde_datadir)/umbrello/headings/template.cpp -type=DATA - -[uml/hi16-app-uml.png] -dist=true -install=true -install_location=$$(kde_icondir)/hicolor/16x16/apps/umbrello.png -type=DATA - -[uml/hi32-app-uml.png] -dist=true -install=true -install_location=$$(kde_icondir)/hicolor/32x32/apps/umbrello.png -type=DATA - -[uml/infowidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/infowidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/kstartuplogo.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/kstartuplogo.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/linepath.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/linepath.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/listpopupmenu.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/listpopupmenu.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/lo16-app-uml.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/16x16/apps/umbrello.png -type=DATA - -[uml/lo32-app-uml.png] -dist=true -install=true -install_location=$$(kde_icondir)/locolor/32x32/apps/umbrello.png -type=DATA - -[uml/main.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/messagewidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/messagewidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/messagewidgetdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/messagewidgetdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/notewidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/notewidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/notewidgetdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/notewidgetdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/objectwidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/objectwidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/objectwidgetdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/objectwidgetdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/operation.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/operation.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/pics/CVglobal_meth.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVglobal_meth.png -type=DATA - -[uml/pics/CVglobal_var.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVglobal_var.png -type=DATA - -[uml/pics/CVnamespace.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVnamespace.png -type=DATA - -[uml/pics/CVprivate_meth.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVprivate_meth.png -type=DATA - -[uml/pics/CVprivate_signal.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVprivate_signal.png -type=DATA - -[uml/pics/CVprivate_slot.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVprivate_slot.png -type=DATA - -[uml/pics/CVprivate_var.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVprivate_var.png -type=DATA - -[uml/pics/CVprotected_meth.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVprotected_meth.png -type=DATA - -[uml/pics/CVprotected_signal.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVprotected_signal.png -type=DATA - -[uml/pics/CVprotected_slot.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVprotected_slot.png -type=DATA - -[uml/pics/CVprotected_var.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVprotected_var.png -type=DATA - -[uml/pics/CVpublic_meth.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVpublic_meth.png -type=DATA - -[uml/pics/CVpublic_signal.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVpublic_signal.png -type=DATA - -[uml/pics/CVpublic_slot.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVpublic_slot.png -type=DATA - -[uml/pics/CVpublic_var.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVpublic_var.png -type=DATA - -[uml/pics/CVstruct.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/CVstruct.png -type=DATA - -[uml/pics/Makefile.am] -files=uml/pics/actor.xpm,uml/pics/aggregation.xpm,uml/pics/anchor.xpm,uml/pics/arrow.xpm,uml/pics/association.xpm,uml/pics/broom.xpm,uml/pics/case.xpm,uml/pics/classicon.xpm,uml/pics/component.xpm,uml/pics/composition.xpm,uml/pics/constraint.xpm,uml/pics/CVglobal_meth.png,uml/pics/CVglobal_var.png,uml/pics/CVnamespace.png,uml/pics/CVprivate_meth.png,uml/pics/CVprivate_signal.png,uml/pics/CVprivate_slot.png,uml/pics/CVprivate_var.png,uml/pics/CVprotected_meth.png,uml/pics/CVprotected_signal.png,uml/pics/CVprotected_slot.png,uml/pics/CVprotected_var.png,uml/pics/CVpublic_meth.png,uml/pics/CVpublic_signal.png,uml/pics/CVpublic_slot.png,uml/pics/CVpublic_var.png,uml/pics/CVstruct.png,uml/pics/dependency.xpm,uml/pics/end_state.xpm,uml/pics/folder_green_open.png,uml/pics/folder_green.png,uml/pics/folder_grey_open.png,uml/pics/folder_grey.png,uml/pics/folder_home.png,uml/pics/generalization.xpm,uml/pics/hline.xpm,uml/pics/implements.xpm,uml/pics/initial_state.xpm,uml/pics/interface.xpm,uml/pics/largepackage.xpm,uml/pics/lifeline.xpm,uml/pics/line.xpm,uml/pics/message.xpm,uml/pics/note.xpm,uml/pics/object.xpm,uml/pics/output_win.xpm,uml/pics/realizes.xpm,uml/pics/rectangle.xpm,uml/pics/smallpackage.xpm,uml/pics/snapshot.xpm,uml/pics/startlogo.png,uml/pics/text.xpm,uml/pics/umlclass_template.xpm,uml/pics/umlclass.xpm,uml/pics/uniassoc.xpm,uml/pics/usecaserelation.xpm,uml/pics/vline.xpm,uml/pics/branch.xpm,uml/pics/fork.xpm -sub_dirs= -type=normal - -[uml/pics/actor.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/actor.xpm -type=DATA - -[uml/pics/aggregation.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/aggregation.xpm -type=DATA - -[uml/pics/anchor.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/anchor.xpm -type=DATA - -[uml/pics/arrow.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/arrow.xpm -type=DATA - -[uml/pics/association.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/association.xpm -type=DATA - -[uml/pics/branch.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/branch.xpm -type=DATA - -[uml/pics/broom.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/broom.xpm -type=DATA - -[uml/pics/case.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/case.xpm -type=DATA - -[uml/pics/classicon.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/classicon.xpm -type=DATA - -[uml/pics/component.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/component.xpm -type=DATA - -[uml/pics/composition.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/composition.xpm -type=DATA - -[uml/pics/constraint.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/constraint.xpm -type=DATA - -[uml/pics/dependency.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/dependency.xpm -type=DATA - -[uml/pics/end_state.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/end_state.xpm -type=DATA - -[uml/pics/folder_green.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/folder_green.png -type=DATA - -[uml/pics/folder_green_open.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/folder_green_open.png -type=DATA - -[uml/pics/folder_grey.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/folder_grey.png -type=DATA - -[uml/pics/folder_grey_open.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/folder_grey_open.png -type=DATA - -[uml/pics/folder_home.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/folder_home.png -type=DATA - -[uml/pics/fork.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/fork.xpm -type=DATA - -[uml/pics/generalization.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/generalization.xpm -type=DATA - -[uml/pics/hline.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/hline.xpm -type=DATA - -[uml/pics/implements.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/implements.xpm -type=DATA - -[uml/pics/initial_state.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/initial_state.xpm -type=DATA - -[uml/pics/interface.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/interface.xpm -type=DATA - -[uml/pics/largepackage.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/largepackage.xpm -type=DATA - -[uml/pics/lifeline.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/lifeline.xpm -type=DATA - -[uml/pics/line.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/line.xpm -type=DATA - -[uml/pics/message.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/message.xpm -type=DATA - -[uml/pics/note.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/note.xpm -type=DATA - -[uml/pics/object.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/object.xpm -type=DATA - -[uml/pics/output_win.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/output_win.xpm -type=DATA - -[uml/pics/realizes.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/realizes.xpm -type=DATA - -[uml/pics/rectangle.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/rectangle.xpm -type=DATA - -[uml/pics/smallpackage.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/smallpackage.xpm -type=DATA - -[uml/pics/snapshot.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/snapshot.xpm -type=DATA - -[uml/pics/startlogo.png] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/startlogo.png -type=DATA - -[uml/pics/text.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/text.xpm -type=DATA - -[uml/pics/umlclass.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/umlclass.xpm -type=DATA - -[uml/pics/umlclass_template.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/umlclass_template.xpm -type=DATA - -[uml/pics/uniassoc.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/uniassoc.xpm -type=DATA - -[uml/pics/usecaserelation.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/usecaserelation.xpm -type=DATA - -[uml/pics/vline.xpm] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/pics/vline.xpm -type=DATA - -[uml/seqlinewidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/seqlinewidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/statewidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/statewidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/statewidgetdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/statewidgetdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/tips] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/tips -type=DATA - -[uml/uml.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/uml.desktop] -dist=true -install=true -install_location=$$(kde_appsdir)/Development/umbrello.desktop -type=DATA - -[uml/uml.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umldoc.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/umldoc.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umllistview.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/umllistview.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umllistviewitem.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/umllistviewitem.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umllistviewitemdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/umllistviewitemdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umllistviewitemdatalist.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umllistviewitemlist.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umlnamespace.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/umlnamespace.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umlobject.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/umlobject.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umlobjectlist.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umlui.rc] -dist=true -install=true -install_location=$$(kde_datadir)/umbrello/umbrelloui.rc -type=DATA - -[uml/umlview.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/umlview.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umlviewcanvas.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/umlviewcanvas.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umlviewdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/umlviewdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umlviewlist.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umlwidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/umlwidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umlwidgetdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/umlwidgetdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/umlwidgetlist.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/usecase.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/usecase.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/usecasewidget.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/usecasewidget.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/usecasewidgetdata.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/usecasewidgetdata.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/worktoolbar.cpp] -dist=true -install=false -install_location= -type=SOURCE - -[uml/worktoolbar.h] -dist=true -install=false -install_location= -type=HEADER - -[uml/x-uml.desktop] -dist=true -install=true -install_location=$$(kde_mimedir)/application/x-uml.desktop -type=DATA |