From f78eb03afb8c9a380985d26286afc40b4c89b292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:15:35 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- buildtools/ada/adaproject_part.cpp | 6 +-- buildtools/ant/antprojectpart.cpp | 4 +- buildtools/ant/antprojectpart.h | 4 +- buildtools/autotools/autodetailsview.cpp | 16 +++--- buildtools/autotools/autodetailsview.h | 10 ++-- buildtools/autotools/autoprojectpart.cpp | 30 +++++------ buildtools/autotools/autoprojectpart.h | 4 +- buildtools/autotools/autoprojectviewbase.ui | 2 +- buildtools/autotools/autoprojectwidget.h | 6 +-- buildtools/autotools/autosubprojectview.cpp | 28 +++++------ buildtools/autotools/autosubprojectview.h | 28 +++++------ buildtools/autotools/autotoolsaction.cpp | 58 +++++++++++----------- buildtools/autotools/autotoolsaction.h | 34 ++++++------- buildtools/autotools/choosetargetdlgbase.ui | 2 +- buildtools/autotools/removetargetdlgbase.ui | 2 +- buildtools/custommakefiles/customprojectpart.cpp | 24 ++++----- buildtools/custommakefiles/customprojectpart.h | 4 +- .../custommakefiles/selectnewfilesdialogbase.ui | 2 +- .../lib/widgets/environmentdisplaydialogbase.ui | 2 +- buildtools/pascal/pascalproject_part.cpp | 6 +-- buildtools/qmake/choosesubprojectdlg.cpp | 4 +- buildtools/qmake/choosesubprojectdlg.h | 2 +- buildtools/qmake/choosesubprojectdlgbase.ui | 2 +- buildtools/qmake/disablesubprojectdlgbase.ui | 2 +- buildtools/qmake/projectconfigurationdlg.cpp | 4 +- buildtools/qmake/projectconfigurationdlg.h | 4 +- buildtools/qmake/projectconfigurationdlgbase.ui | 2 +- buildtools/qmake/trolllistview.cpp | 2 +- buildtools/qmake/trolllistview.h | 2 +- buildtools/qmake/trollprojectpart.cpp | 28 +++++------ buildtools/qmake/trollprojectwidget.cpp | 20 ++++---- buildtools/qmake/trollprojectwidget.h | 12 ++--- buildtools/script/scriptprojectpart.cpp | 6 +-- 33 files changed, 181 insertions(+), 181 deletions(-) (limited to 'buildtools') diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index 1ee9829a..25aa79f7 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -52,11 +52,11 @@ AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStrin setInstance(AdaProjectFactory::instance()); setXMLFile("kdevadaproject.rc"); - KAction *action; - action = new KAction( i18n("&Build Project"), "make_tdevelop", Key_F8, + TDEAction *action; + action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); - action = new KAction( i18n("Execute Program"), "exec", 0, + action = new TDEAction( i18n("Execute Program"), "exec", 0, this, TQT_SLOT(slotExecute()), actionCollection(), "build_execute" ); diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index 769fd3df..2925f240 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -52,13 +52,13 @@ AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStrin setXMLFile("kdevantproject.rc"); - m_buildProjectAction = new KAction(i18n("&Build Project"), "make_tdevelop", Key_F8, + m_buildProjectAction = new TDEAction(i18n("&Build Project"), "make_tdevelop", Key_F8, this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); m_buildProjectAction->setToolTip(i18n("Build project")); m_buildProjectAction->setWhatsThis(i18n("Build project

Executes ant dist command to build the project.")); - KActionMenu *menu = new KActionMenu(i18n("Build &Target"), + TDEActionMenu *menu = new TDEActionMenu(i18n("Build &Target"), actionCollection(), "build_target" ); menu->setToolTip(i18n("Build target")); menu->setWhatsThis(i18n("Build target

Executes ant target_name command to build the specified target.")); diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h index 6185d2c6..e3b325d2 100644 --- a/buildtools/ant/antprojectpart.h +++ b/buildtools/ant/antprojectpart.h @@ -10,7 +10,7 @@ class TQPopupMenu; -class KAction; +class TDEAction; class KDialogBase; class Context; class ClassPathWidget; @@ -103,7 +103,7 @@ private: AntOptions m_antOptions; - KAction *m_buildProjectAction; + TDEAction *m_buildProjectAction; TQPopupMenu *m_targetMenu; diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 9c72999f..d07329ff 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -174,7 +174,7 @@ void AutoDetailsView::slotSelectionChanged( TQListViewItem* item ) void AutoDetailsView::initActions() { - KActionCollection * actions = new KActionCollection( this ); + TDEActionCollection * actions = new TDEActionCollection( this ); targetOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetOptions() ), actions, @@ -207,7 +207,7 @@ void AutoDetailsView::initActions() addExistingFileAction->plug( m_button2 ); addExistingFileAction->setEnabled( false ); - addIconAction = new KAction( i18n( "Add Icon..." ), "iconadd_tdevelop", 0, + addIconAction = new TDEAction( i18n( "Add Icon..." ), "iconadd_tdevelop", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddIcon() ), actions, "add icon" ); addIconAction->setWhatsThis(i18n("Add icon

Adds an icon to a KDEICON target.")); @@ -230,7 +230,7 @@ void AutoDetailsView::initActions() executeTargetAction->plug( m_button5 ); executeTargetAction->setEnabled( false ); - setActiveTargetAction = new KAction( i18n( "Make Target Active" ), "", 0, + setActiveTargetAction = new TDEAction( i18n( "Make Target Active" ), "", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSetActiveTarget() ), actions, "set active target" ); setActiveTargetAction->setWhatsThis(i18n("Make target active

Marks the " @@ -255,8 +255,8 @@ void AutoDetailsView::initActions() this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); connect( m_listView, TQT_SIGNAL( returnPressed( TQListViewItem* ) ), this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); - connect( m_listView, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotDetailsContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( m_listView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); } TQString AutoDetailsView::getUiFileLink(const TQString& relpath, const TQString& filename) @@ -469,7 +469,7 @@ void AutoDetailsView::slotRemoveDetail() } -void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) +void AutoDetailsView::slotDetailsContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return; @@ -499,7 +499,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, else caption = titem->name; - KPopupMenu popup( i18n( "Target: %1" ).arg( caption ), this ); + TDEPopupMenu popup( i18n( "Target: %1" ).arg( caption ), this ); if ( titem->primary == "PROGRAMS" || titem->primary == "LIBRARIES" || titem->primary == "LTLIBRARIES" || titem->primary == "JAVA" ) @@ -554,7 +554,7 @@ void AutoDetailsView::slotDetailsContextMenu( KListView *, TQListViewItem *item, return; } - KPopupMenu popup( i18n( "File: %1" ).arg( fitem->name ), this ); + TDEPopupMenu popup( i18n( "File: %1" ).arg( fitem->name ), this ); removeDetailAction->plug( &popup ); KURL::List urls; diff --git a/buildtools/autotools/autodetailsview.h b/buildtools/autotools/autodetailsview.h index d1673cdd..c2ad1afb 100644 --- a/buildtools/autotools/autodetailsview.h +++ b/buildtools/autotools/autodetailsview.h @@ -21,7 +21,7 @@ #include "domutil.h" #include "autolistviewitems.h" -class KAction; +class TDEAction; class AutoProjectPart; class AutoProjectWidget; @@ -39,7 +39,7 @@ public: virtual ~AutoDetailsView(); TQString getUiFileLink( const TQString &path, const TQString& filename ); - KListView* listView() + TDEListView* listView() { return m_listView; } @@ -57,7 +57,7 @@ protected: private slots: void slotDetailsExecuted( TQListViewItem *item ); - void slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); + void slotDetailsContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ); void slotTargetOptions (); void slotAddNewFile(); @@ -77,10 +77,10 @@ private: AutoToolsAction* targetOptionsAction; AutoToolsAction* addNewFileAction; AutoToolsAction* addExistingFileAction; - KAction* addIconAction; + TDEAction* addIconAction; AutoToolsAction* buildTargetAction; AutoToolsAction* executeTargetAction; - KAction* setActiveTargetAction; + TDEAction* setActiveTargetAction; AutoToolsAction* removeDetailAction; }; diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index a84038a2..81877df9 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -88,9 +88,9 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr "targets and files for the subproject selected in the overview.")); mainWindow()->embedSelectViewRight(m_widget, i18n("Automake Manager"), i18n("Automake manager")); - KAction *action; + TDEAction *action; - action = new KAction( i18n("Add Translation..."), 0, + action = new TDEAction( i18n("Add Translation..."), 0, this, TQT_SLOT(slotAddTranslation()), actionCollection(), "project_addtranslation" ); action->setToolTip(i18n("Add translation")); @@ -101,7 +101,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr if (!m_isKDE) action->setEnabled(false); - action = new KAction( i18n("&Build Project"), "make_tdevelop", Key_F8, + action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); action->setToolTip(i18n("Build project")); @@ -110,7 +110,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr "in the project settings dialog, Make Options tab.")); action->setGroup("autotools"); - action = new KAction( i18n("Build &Active Target"), "make_tdevelop", Key_F7, + action = new TDEAction( i18n("Build &Active Target"), "make_tdevelop", Key_F7, this, TQT_SLOT(slotBuildActiveTarget()), actionCollection(), "build_buildactivetarget" ); action->setToolTip(i18n("Build active target")); @@ -120,7 +120,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr "in the project settings dialog, Make Options tab.")); action->setGroup("autotools"); - action = new KAction( i18n("Compile &File"), "make_tdevelop", + action = new TDEAction( i18n("Compile &File"), "make_tdevelop", this, TQT_SLOT(slotCompileFile()), actionCollection(), "build_compilefile" ); action->setToolTip(i18n("Compile file")); @@ -129,7 +129,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr "in the project settings dialog, Make Options tab.")); action->setGroup("autotools"); - action = new KAction( i18n("Run Configure"), 0, + action = new TDEAction( i18n("Run Configure"), 0, this, TQT_SLOT(slotConfigure()), actionCollection(), "build_configure" ); action->setToolTip(i18n("Run configure")); @@ -138,21 +138,21 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr "Configure Options tab.")); action->setGroup("autotools"); - action = new KAction( i18n("Run automake && friends"), 0, + action = new TDEAction( i18n("Run automake && friends"), 0, this, TQT_SLOT(slotMakefilecvs()), actionCollection(), "build_makefilecvs" ); action->setToolTip(i18n("Run automake && friends")); action->setWhatsThis(i18n("Run automake && friends

Executes
make -f Makefile.cvs
./configure
commands from the project directory.")); action->setGroup("autotools"); - action = new KAction( i18n("Update admin module"), 0, + action = new TDEAction( i18n("Update admin module"), 0, this, TQT_SLOT(slotUpdateAdminDirectory()), actionCollection(), "build_updateadmin" ); action->setToolTip(i18n("Update admin module")); action->setWhatsThis(i18n("Update admin module

Recreates the project admin directory using the version present on the local system.")); action->setGroup("autotools"); - action = new KAction( i18n("Install"), 0, + action = new TDEAction( i18n("Install"), 0, this, TQT_SLOT(slotInstall()), actionCollection(), "build_install" ); action->setToolTip(i18n("Install")); @@ -161,7 +161,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr "in the project settings dialog, Make Options tab.")); action->setGroup("autotools"); - action = new KAction( i18n("Install (as root user)"), 0, + action = new TDEAction( i18n("Install (as root user)"), 0, this, TQT_SLOT(slotInstallWithKdesu()), actionCollection(), "build_install_tdesu" ); action->setToolTip(i18n("Install as root user")); @@ -171,7 +171,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr "in the project settings dialog, Make Options tab.")); action->setGroup("autotools"); - action = new KAction( i18n("&Clean Project"), 0, + action = new TDEAction( i18n("&Clean Project"), 0, this, TQT_SLOT(slotClean()), actionCollection(), "build_clean" ); action->setToolTip(i18n("Clean project")); @@ -180,7 +180,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr "in the project settings dialog, Make Options tab.")); action->setGroup("autotools"); - action = new KAction( i18n("&Distclean"), 0, + action = new TDEAction( i18n("&Distclean"), 0, this, TQT_SLOT(slotDistClean()), actionCollection(), "build_distclean" ); action->setToolTip(i18n("Distclean")); @@ -189,7 +189,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr "in the project settings dialog, Make Options tab.")); action->setGroup("autotools"); - action = new KAction( i18n("Make Messages && Merge"), 0, + action = new TDEAction( i18n("Make Messages && Merge"), 0, this, TQT_SLOT(slotMakeMessages()), actionCollection(), "build_messages" ); action->setToolTip(i18n("Make messages && merge")); @@ -201,7 +201,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr if (!m_isKDE) action->setEnabled(false); - buildConfigAction = new KSelectAction( i18n("Build Configuration"), 0, + buildConfigAction = new TDESelectAction( i18n("Build Configuration"), 0, actionCollection(), "project_configuration" ); buildConfigAction->setToolTip(i18n("Build configuration menu")); buildConfigAction->setWhatsThis(i18n("Build configuration menu

Allows to switch between project build configurations.
" @@ -213,7 +213,7 @@ AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStr TQDomDocument &dom = *projectDom(); if (!DomUtil::readBoolEntry(dom, "/kdevautoproject/run/disable_default")) { //ok we handle the execute in this kpart - action = new KAction( i18n("Execute Program"), "exec", SHIFT+Key_F9, + action = new TDEAction( i18n("Execute Program"), "exec", SHIFT+Key_F9, this, TQT_SLOT(slotExecute()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Execute program")); diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index 63da2fd9..6502fba7 100644 --- a/buildtools/autotools/autoprojectpart.h +++ b/buildtools/autotools/autoprojectpart.h @@ -27,7 +27,7 @@ class TQDomElement; class TQStringList; class KDialogBase; class AutoProjectWidget; -class KSelectAction; +class TDESelectAction; class TargetItem; class ConfigWidgetProxy; @@ -121,7 +121,7 @@ private: TQGuardedPtr m_widget; TQString m_projectName; TQString m_projectPath; - KSelectAction *buildConfigAction; + TDESelectAction *buildConfigAction; TQString makeEnvironment() const; void setWantautotools(); diff --git a/buildtools/autotools/autoprojectviewbase.ui b/buildtools/autotools/autoprojectviewbase.ui index 3e33fb41..e35219f0 100644 --- a/buildtools/autotools/autoprojectviewbase.ui +++ b/buildtools/autotools/autoprojectviewbase.ui @@ -100,7 +100,7 @@ - + m_listView diff --git a/buildtools/autotools/autoprojectwidget.h b/buildtools/autotools/autoprojectwidget.h index 7859f472..8ad8bf7e 100644 --- a/buildtools/autotools/autoprojectwidget.h +++ b/buildtools/autotools/autoprojectwidget.h @@ -36,12 +36,12 @@ class AutoDetailsView; class SubprojectItem; class TargetItem; class FileItem; -class KAction; +class TDEAction; class TQDomElement; class TQToolButton; class TQStringList; class TQFocusEvent; -class KListViewItem; +class TDEListViewItem; class TQListViewItem; class MakefileHandler; @@ -63,7 +63,7 @@ public: */ TQStringList allSubprojects(); /** - * A list of all Subproject items in the overview KListView + * A list of all Subproject items in the overview TDEListView */ TQPtrList allSubprojectItems(); /** diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 9e9459fd..42223c15 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -170,7 +170,7 @@ void AutoSubprojectView::loadMakefileams ( const TQString& dir ) void AutoSubprojectView::initActions() { - KActionCollection * actions = new KActionCollection( this ); + TDEActionCollection * actions = new TDEActionCollection( this ); subProjectOptionsAction = new AutoToolsAction( i18n( "Options..." ), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT( slotSubprojectOptions() ), actions, "subproject options" ); @@ -186,12 +186,12 @@ void AutoSubprojectView::initActions() "subproject in currently selected subproject.")); addSubprojectAction->plug( m_button1 ); - removeSubprojectAction = new KAction( i18n( "Remove Subproject..." ), "remove_subdir", 0, + removeSubprojectAction = new TDEAction( i18n( "Remove Subproject..." ), "remove_subdir", 0, TQT_TQOBJECT(this), TQT_SLOT( slotRemoveSubproject() ), actions, "remove subproject" ); removeSubprojectAction->setWhatsThis(i18n("Remove subproject

Removes the subproject. Asks if the " "subproject should be also removed from disk. Only subprojects " "which do not hold other subprojects can be removed.")); - addExistingSubprojectAction = new KAction( i18n( "Add Existing Subprojects..." ), "fileimport", 0, + addExistingSubprojectAction = new TDEAction( i18n( "Add Existing Subprojects..." ), "fileimport", 0, TQT_TQOBJECT(this), TQT_SLOT( slotAddExistingSubproject() ), actions, "add existing subproject" ); addExistingSubprojectAction->setWhatsThis(i18n("Add existing subprojects

Imports existing " "subprojects containing Makefile.am.")); @@ -226,7 +226,7 @@ void AutoSubprojectView::initActions() "dialog, Make Options tab.")); buildSubprojectAction->plug( m_button5 ); - forceReeditSubprojectAction = new KAction( i18n( "Force Reedit" ), 0, 0, TQT_TQOBJECT(this), + forceReeditSubprojectAction = new TDEAction( i18n( "Force Reedit" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotForceReeditSubproject() ), actions, "force-reedit subproject" ); forceReeditSubprojectAction->setWhatsThis(i18n("Force Reedit

Runs make force-reedit " "from the directory of the selected subproject.
This " @@ -238,20 +238,20 @@ void AutoSubprojectView::initActions() if (!m_part->isKDE()) forceReeditSubprojectAction->setEnabled(false); - cleanSubprojectAction = new KAction( i18n( "Clean" ), 0, 0, TQT_TQOBJECT(this), + cleanSubprojectAction = new TDEAction( i18n( "Clean" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotCleanSubproject() ), actions, "clean subproject" ); cleanSubprojectAction->setWhatsThis(i18n("Clean

Runs make clean from the directory of " "the selected subproject.
Environment variables and make " "arguments can be specified in the project settings dialog, " "Make Options tab.")); - installSubprojectAction = new KAction( i18n( "Install" ), 0, 0, TQT_TQOBJECT(this), + installSubprojectAction = new TDEAction( i18n( "Install" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotInstallSubproject() ), actions, "install subproject" ); installSubprojectAction->setWhatsThis(i18n("Install

Runs make install from the directory " "of the selected subproject.
Environment variables and " "make arguments can be specified in the project settings " "dialog, Make Options tab.")); - installSuSubprojectAction = new KAction( i18n( "Install (as root user)" ), 0, 0, + installSuSubprojectAction = new TDEAction( i18n( "Install (as root user)" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotInstallSuSubproject() ), actions, "install subproject as root" ); installSuSubprojectAction->setWhatsThis(i18n("Install as root user

Runs make install " "command from the directory of the selected subproject " @@ -260,27 +260,27 @@ void AutoSubprojectView::initActions() "can be specified in the project settings dialog, " "Make Options tab.")); - expandAction = new KAction( i18n( "Expand Subtree" ), 0, 0, TQT_TQOBJECT(this), + expandAction = new TDEAction( i18n( "Expand Subtree" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotExpandTree()), actions, "expandAction" ); - collapseAction = new KAction( i18n( "Collapse Subtree" ), 0, 0, TQT_TQOBJECT(this), + collapseAction = new TDEAction( i18n( "Collapse Subtree" ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotCollapseTree()), actions, "collapseAction" ); - otherAction = new KAction( i18n( "Manage Custom Commands..." ), 0, 0, TQT_TQOBJECT(this), + otherAction = new TDEAction( i18n( "Manage Custom Commands..." ), 0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotManageBuildCommands() ), actions, "manage custom commands" ); otherAction->setWhatsThis(i18n("Manage custom commands

Allows to create, edit and " "delete custom build commands which appears in the subproject " "context menu.
")); - connect( m_listView, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( m_listView, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); } -void AutoSubprojectView::slotContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) +void AutoSubprojectView::slotContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return ; - KPopupMenu popup( i18n( "Subproject: %1" ).arg( item->text( 0 ) ), this ); + TDEPopupMenu popup( i18n( "Subproject: %1" ).arg( item->text( 0 ) ), this ); subProjectOptionsAction->plug( &popup ); popup.insertSeparator(); diff --git a/buildtools/autotools/autosubprojectview.h b/buildtools/autotools/autosubprojectview.h index cfeeb11c..fab7c546 100644 --- a/buildtools/autotools/autosubprojectview.h +++ b/buildtools/autotools/autosubprojectview.h @@ -20,14 +20,14 @@ #include "autoprojectviewbase.h" -class KAction; +class TDEAction; class AutoToolsAction; class AutoProjectWidget; class AutoProjectPart; class TargetItem; class SubprojectItem; -class KListViewItem; -class KListView; +class TDEListViewItem; +class TDEListView; namespace AutoProjectPrivate { @@ -51,7 +51,7 @@ public: void loadMakefileams ( const TQString& dir ); void parse( SubprojectItem *item ); - KListView* listView() const + TDEListView* listView() const { return m_listView; } @@ -88,24 +88,24 @@ private: AutoToolsAction* addApplicationAction; AutoToolsAction* subProjectOptionsAction; AutoToolsAction* addSubprojectAction; - KAction* addExistingSubprojectAction; + TDEAction* addExistingSubprojectAction; AutoToolsAction* addTargetAction; AutoToolsAction* addServiceAction; AutoToolsAction* buildSubprojectAction; - KAction* removeSubprojectAction; - KAction* cleanSubprojectAction; - KAction* forceReeditSubprojectAction; - KAction* installSubprojectAction; - KAction* installSuSubprojectAction; - KAction* otherAction; - KAction* expandAction; - KAction* collapseAction; + TDEAction* removeSubprojectAction; + TDEAction* cleanSubprojectAction; + TDEAction* forceReeditSubprojectAction; + TDEAction* installSubprojectAction; + TDEAction* installSuSubprojectAction; + TDEAction* otherAction; + TDEAction* expandAction; + TDEAction* collapseAction; TQStringList m_commandList; TQValueList m_commandTypeList; private slots: - void slotContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); + void slotContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ); //void slotSubprojectExecuted(TQListViewItem* item); void slotSelectionChanged( TQListViewItem* item ); void slotAddApplication(); diff --git a/buildtools/autotools/autotoolsaction.cpp b/buildtools/autotools/autotoolsaction.cpp index a9404e69..81039078 100644 --- a/buildtools/autotools/autotoolsaction.cpp +++ b/buildtools/autotools/autotoolsaction.cpp @@ -24,87 +24,87 @@ AutoToolsAction::~AutoToolsAction() { } -AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, +AutoToolsAction::AutoToolsAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( text, cut, receiver, slot, parent, name ) + TDEActionCollection* parent, const char* name ) +: TDEAction( text, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, +AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) + TDEActionCollection* parent, const char* name ) +: TDEAction( text, pix, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, +AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, const TDEShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) + TDEActionCollection* parent, const char* name ) +: TDEAction( text, pix, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const KGuiItem& item, const KShortcut & cut, +AutoToolsAction::AutoToolsAction( const KGuiItem& item, const TDEShortcut & cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ) -: KAction( item, cut, receiver, slot, parent, name ) + TDEActionCollection* parent, const char* name ) +: TDEAction( item, cut, receiver, slot, parent, name ) { } -AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, +AutoToolsAction::AutoToolsAction( const TQString& text, const TDEShortcut& cut, TQObject* parent, const char* name ) -: KAction( text, cut, parent, name ) +: TDEAction( text, cut, parent, name ) { } -AutoToolsAction::AutoToolsAction( const TQString& text, const KShortcut& cut, +AutoToolsAction::AutoToolsAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) -: KAction( text, cut, receiver, slot, parent, name ) +: TDEAction( text, cut, receiver, slot, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut, TQObject* parent, const char* name ) -: KAction( text, pix, cut, parent, name ) + const TDEShortcut& cut, TQObject* parent, const char* name ) +: TDEAction( text, pix, cut, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, - const KShortcut& cut, TQObject* parent, const char* name ) -: KAction( text, pix, cut, parent, name ) + const TDEShortcut& cut, TQObject* parent, const char* name ) +: TDEAction( text, pix, cut, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQIconSet& pix, - const KShortcut& cut, const TQObject* receiver, + const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char * name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) +: TDEAction( text, pix, cut, receiver, slot, parent, name ) { } AutoToolsAction::AutoToolsAction( const TQString& text, const TQString& pix, - const KShortcut & cut, const TQObject* receiver, + const TDEShortcut & cut, const TQObject* receiver, const char* slot, TQObject* parent, const char * name ) -: KAction( text, pix, cut, receiver, slot, parent, name ) +: TDEAction( text, pix, cut, receiver, slot, parent, name ) { } AutoToolsAction::AutoToolsAction( TQObject * parent, const char * name ) -: KAction( parent, name ) +: TDEAction( parent, name ) { } int AutoToolsAction::plug( TQWidget* w, int index ) { if ( !w ) { - kdWarning(129) << "KAction::plug called with 0 argument\n"; + kdWarning(129) << "TDEAction::plug called with 0 argument\n"; return -1; } // Check if action is permitted - if (kapp && !kapp->authorizeKAction(name())) + if (kapp && !kapp->authorizeTDEAction(name())) return -1; if ( ::tqqt_cast( w ) ) @@ -138,7 +138,7 @@ int AutoToolsAction::plug( TQWidget* w, int index ) return containerCount() - 1; } - return KAction::plug( w, index ); + return TDEAction::plug( w, index ); } void AutoToolsAction::updateEnabled( int i ) @@ -148,7 +148,7 @@ void AutoToolsAction::updateEnabled( int i ) if ( ::tqqt_cast( w ) ) static_cast( w )->setEnabled( isEnabled() ); else - KAction::updateEnabled( i ) ; + TDEAction::updateEnabled( i ) ; } diff --git a/buildtools/autotools/autotoolsaction.h b/buildtools/autotools/autotoolsaction.h index 013bf006..2d397359 100644 --- a/buildtools/autotools/autotoolsaction.h +++ b/buildtools/autotools/autotoolsaction.h @@ -18,44 +18,44 @@ #include class TQObject; -class KActionCollection; +class TDEActionCollection; /** - * A KAction derivative that will work with the TQToolButtons used in + * A TDEAction derivative that will work with the TQToolButtons used in * the Automake Manager * @author Matt Rogers */ -class AutoToolsAction : public KAction +class AutoToolsAction : public TDEAction { public: virtual ~AutoToolsAction(); - AutoToolsAction( const TQString& text, const KShortcut& cut, + AutoToolsAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + TDEActionCollection* parent, const char* name ); - AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, + AutoToolsAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + TDEActionCollection* parent, const char* name ); - AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, + AutoToolsAction( const TQString& text, const TQString& pix, const TDEShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + TDEActionCollection* parent, const char* name ); - AutoToolsAction( const KGuiItem& item, const KShortcut& cut, + AutoToolsAction( const KGuiItem& item, const TDEShortcut& cut, const TQObject* receiver, const char* slot, - KActionCollection* parent, const char* name ); + TDEActionCollection* parent, const char* name ); - AutoToolsAction( const TQString& text, const KShortcut& cut = KShortcut(), TQObject* parent = 0, const char* name = 0 ); - AutoToolsAction( const TQString& text, const KShortcut& cut, + AutoToolsAction( const TQString& text, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 ); + AutoToolsAction( const TQString& text, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut = KShortcut(), + AutoToolsAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 ); - AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut = KShortcut(), + AutoToolsAction( const TQString& text, const TQString& pix, const TDEShortcut& cut = TDEShortcut(), TQObject* parent = 0, const char* name = 0 ); - AutoToolsAction( const TQString& text, const TQIconSet& pix, const KShortcut& cut, + AutoToolsAction( const TQString& text, const TQIconSet& pix, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); - AutoToolsAction( const TQString& text, const TQString& pix, const KShortcut& cut, + AutoToolsAction( const TQString& text, const TQString& pix, const TDEShortcut& cut, const TQObject* receiver, const char* slot, TQObject* parent, const char* name = 0 ); AutoToolsAction( TQObject* parent = 0, const char* name = 0 ); diff --git a/buildtools/autotools/choosetargetdlgbase.ui b/buildtools/autotools/choosetargetdlgbase.ui index d6a04658..3cd16825 100644 --- a/buildtools/autotools/choosetargetdlgbase.ui +++ b/buildtools/autotools/choosetargetdlgbase.ui @@ -143,7 +143,7 @@ unnamed - + newFileList diff --git a/buildtools/autotools/removetargetdlgbase.ui b/buildtools/autotools/removetargetdlgbase.ui index 514bdbaa..57b947a6 100644 --- a/buildtools/autotools/removetargetdlgbase.ui +++ b/buildtools/autotools/removetargetdlgbase.ui @@ -162,7 +162,7 @@ unnamed - + dependencyListBox diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index 6e5bc476..a2437019 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -74,13 +74,13 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const m_executeAfterBuild = false; - KAction *action; + TDEAction *action; - action = new KAction( i18n( "Re-Populate Project" ), 0, this, TQT_SLOT( populateProject() ), actionCollection(), "repopulate_project" ); + action = new TDEAction( i18n( "Re-Populate Project" ), 0, this, TQT_SLOT( populateProject() ), actionCollection(), "repopulate_project" ); action->setToolTip( i18n( "Re-Populate Project" ) ); action->setWhatsThis( i18n( "Re-Populate Project

Re-Populates the project, searching through the project directory and adding all files that match one of the wildcards set in the custom manager options of the project filelist." ) ); - action = new KAction( i18n( "&Build Project" ), "make_tdevelop", Key_F8, + action = new TDEAction( i18n( "&Build Project" ), "make_tdevelop", Key_F8, this, TQT_SLOT( slotBuild() ), actionCollection(), "build_build" ); action->setToolTip( i18n( "Build project" ) ); @@ -88,7 +88,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "Environment variables and make arguments can be specified " "in the project settings dialog, Build Options tab." ) ); - action = new KAction( i18n( "&Build Active Directory" ), "make_tdevelop", Key_F7, + action = new TDEAction( i18n( "&Build Active Directory" ), "make_tdevelop", Key_F7, this, TQT_SLOT( slotBuildActiveDir() ), actionCollection(), "build_buildactivetarget" ); action->setToolTip( i18n( "Build active directory" ) ); @@ -96,7 +96,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab." ) ); - action = new KAction( i18n( "Compile &File" ), "make_tdevelop", + action = new TDEAction( i18n( "Compile &File" ), "make_tdevelop", this, TQT_SLOT( slotCompileFile() ), actionCollection(), "build_compilefile" ); action->setToolTip( i18n( "Compile file" ) ); @@ -104,7 +104,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "Environment variables and make arguments can be specified " "in the project settings dialog, Build Options tab." ) ); - action = new KAction( i18n( "Install" ), 0, + action = new TDEAction( i18n( "Install" ), 0, this, TQT_SLOT( slotInstall() ), actionCollection(), "build_install" ); action->setToolTip( i18n( "Install" ) ); @@ -112,7 +112,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab." ) ); - action = new KAction( i18n( "Install Active Directory" ), 0, + action = new TDEAction( i18n( "Install Active Directory" ), 0, this, TQT_SLOT( slotInstallActiveDir() ), actionCollection(), "build_installactivetarget" ); action->setToolTip( i18n( "Install active directory" ) ); @@ -120,7 +120,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab." ) ); - action = new KAction( i18n( "Install (as root user)" ), 0, + action = new TDEAction( i18n( "Install (as root user)" ), 0, this, TQT_SLOT( slotInstallWithKdesu() ), actionCollection(), "build_install_tdesu" ); action->setToolTip( i18n( "Install as root user" ) ); @@ -129,7 +129,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab." ) ); - action = new KAction( i18n( "&Clean Project" ), 0, + action = new TDEAction( i18n( "&Clean Project" ), 0, this, TQT_SLOT( slotClean() ), actionCollection(), "build_clean" ); action->setToolTip( i18n( "Clean project" ) ); @@ -137,14 +137,14 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const "Environment variables and make arguments can be specified " "in the project settings dialog, Build Options tab." ) ); - action = new KAction( i18n( "Execute Program" ), "exec", 0, + action = new TDEAction( i18n( "Execute Program" ), "exec", 0, this, TQT_SLOT( slotExecute() ), actionCollection(), "build_execute" ); action->setToolTip( i18n( "Execute program" ) ); action->setWhatsThis( i18n( "Execute program

Executes the main program specified in project settings, Run Options tab. " "If it is not specified then the active target is used to determine the application to run." ) ); - KActionMenu *menu = new KActionMenu( i18n( "Build &Target" ), + TDEActionMenu *menu = new TDEActionMenu( i18n( "Build &Target" ), actionCollection(), "build_target" ); m_targetMenu = menu->popupMenu(); menu->setToolTip( i18n( "Build target" ) ); @@ -155,7 +155,7 @@ CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const m_targetObjectFilesMenu = new TQPopupMenu(); m_targetOtherFilesMenu = new TQPopupMenu(); - m_makeEnvironmentsSelector = new KSelectAction( i18n( "Make &Environment" ), 0, + m_makeEnvironmentsSelector = new TDESelectAction( i18n( "Make &Environment" ), 0, actionCollection(), "build_make_environment" ); m_makeEnvironmentsSelector->setToolTip( i18n( "Make environment" ) ); m_makeEnvironmentsSelector->setWhatsThis( i18n( "Make Environment

Choose the set of environment variables to be passed on to make.
" diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h index 76680fa7..193218e4 100644 --- a/buildtools/custommakefiles/customprojectpart.h +++ b/buildtools/custommakefiles/customprojectpart.h @@ -28,7 +28,7 @@ class TQStringList; class KDialogBase; class CustomProjectWidget; class Context; -class KSelectAction; +class TDESelectAction; class CustomProjectPart : public KDevBuildTool { @@ -136,7 +136,7 @@ private: TQPopupMenu *m_targetMenu; TQPopupMenu *m_targetObjectFilesMenu; TQPopupMenu *m_targetOtherFilesMenu; - KSelectAction *m_makeEnvironmentsSelector; + TDESelectAction *m_makeEnvironmentsSelector; TQStringList m_targets; TQStringList m_targetsObjectFiles; TQStringList m_targetsOtherFiles; diff --git a/buildtools/custommakefiles/selectnewfilesdialogbase.ui b/buildtools/custommakefiles/selectnewfilesdialogbase.ui index baaa3012..e922d0e3 100644 --- a/buildtools/custommakefiles/selectnewfilesdialogbase.ui +++ b/buildtools/custommakefiles/selectnewfilesdialogbase.ui @@ -24,7 +24,7 @@ Files to add to the Project: - + fileView diff --git a/buildtools/lib/widgets/environmentdisplaydialogbase.ui b/buildtools/lib/widgets/environmentdisplaydialogbase.ui index 5388fe59..99758459 100644 --- a/buildtools/lib/widgets/environmentdisplaydialogbase.ui +++ b/buildtools/lib/widgets/environmentdisplaydialogbase.ui @@ -30,7 +30,7 @@ unnamed - + Variable diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index c5da93fe..f77f23ca 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -58,14 +58,14 @@ PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const T setInstance(PascalProjectFactory::instance()); setXMLFile("kdevpascalproject.rc"); - KAction *action; - action = new KAction( i18n("&Build Project"), "make_tdevelop", Key_F8, + TDEAction *action; + action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, this, TQT_SLOT(slotBuild()), actionCollection(), "build_build" ); action->setToolTip(i18n("Build project")); action->setWhatsThis(i18n("Build project

Runs the compiler on a main source file of the project. " "The compiler and the main source file can be set in project settings, Pascal Compiler tab.")); - action = new KAction( i18n("Execute Program"), "exec", 0, + action = new TDEAction( i18n("Execute Program"), "exec", 0, this, TQT_SLOT(slotExecute()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Execute program")); diff --git a/buildtools/qmake/choosesubprojectdlg.cpp b/buildtools/qmake/choosesubprojectdlg.cpp index 63da84f8..815a6ef7 100644 --- a/buildtools/qmake/choosesubprojectdlg.cpp +++ b/buildtools/qmake/choosesubprojectdlg.cpp @@ -48,12 +48,12 @@ void ChooseSubprojectDlg::accept() } ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListViewItem * parent, TQString text ) - :KListViewItem(parent, text), m_spitem(spitem) + :TDEListViewItem(parent, text), m_spitem(spitem) { } ChooseItem::ChooseItem( QMakeScopeItem * spitem, TQListView * parent, TQString text ) - :KListViewItem(parent, text), m_spitem(spitem) + :TDEListViewItem(parent, text), m_spitem(spitem) { } diff --git a/buildtools/qmake/choosesubprojectdlg.h b/buildtools/qmake/choosesubprojectdlg.h index cdddc4dc..18656480 100644 --- a/buildtools/qmake/choosesubprojectdlg.h +++ b/buildtools/qmake/choosesubprojectdlg.h @@ -19,7 +19,7 @@ class QMakeScopeItem; class TrollProjectWidget; -class ChooseItem: public KListViewItem +class ChooseItem: public TDEListViewItem { public: ChooseItem(QMakeScopeItem *spitem, TQListViewItem *parent, TQString text); diff --git a/buildtools/qmake/choosesubprojectdlgbase.ui b/buildtools/qmake/choosesubprojectdlgbase.ui index f1e2e579..d5f6566d 100644 --- a/buildtools/qmake/choosesubprojectdlgbase.ui +++ b/buildtools/qmake/choosesubprojectdlgbase.ui @@ -86,7 +86,7 @@ - + Subprojects diff --git a/buildtools/qmake/disablesubprojectdlgbase.ui b/buildtools/qmake/disablesubprojectdlgbase.ui index fadafc04..c1d09af1 100644 --- a/buildtools/qmake/disablesubprojectdlgbase.ui +++ b/buildtools/qmake/disablesubprojectdlgbase.ui @@ -19,7 +19,7 @@ unnamed - + Subprojects diff --git a/buildtools/qmake/projectconfigurationdlg.cpp b/buildtools/qmake/projectconfigurationdlg.cpp index 8f4ffc70..a74b0793 100644 --- a/buildtools/qmake/projectconfigurationdlg.cpp +++ b/buildtools/qmake/projectconfigurationdlg.cpp @@ -85,7 +85,7 @@ void InsideCheckListItem::stateChange( bool state ) } CustomVarListItem::CustomVarListItem(TQListView* parent, unsigned int id, TQMap var) - : KListViewItem(parent), m_key(id) + : TDEListViewItem(parent), m_key(id) { setText(0, var["var"]); setText(1, var["op"]); @@ -96,7 +96,7 @@ TQString CustomVarListItem::key(int column, bool ascending) const { if( column == 0) return TQString::number(m_key); - return KListViewItem::key(column, ascending); + return TDEListViewItem::key(column, ascending); } ProjectConfigurationDlg::ProjectConfigurationDlg( TQListView *_prjList, TrollProjectWidget* _prjWidget, TQWidget* parent, const char* name, bool modal, WFlags fl ) diff --git a/buildtools/qmake/projectconfigurationdlg.h b/buildtools/qmake/projectconfigurationdlg.h index 50014e55..d02ff7e4 100644 --- a/buildtools/qmake/projectconfigurationdlg.h +++ b/buildtools/qmake/projectconfigurationdlg.h @@ -26,7 +26,7 @@ #include class QMakeScopeItem; -class KListViewItem; +class TDEListViewItem; class qProjectItem; class ProjectConfigurationDlg; class TrollProjectWidget; @@ -44,7 +44,7 @@ protected: virtual void stateChange ( bool state ); }; -class CustomVarListItem : public KListViewItem +class CustomVarListItem : public TDEListViewItem { public: CustomVarListItem( TQListView*, unsigned int, TQMap ); diff --git a/buildtools/qmake/projectconfigurationdlgbase.ui b/buildtools/qmake/projectconfigurationdlgbase.ui index 6f4bf0d9..24bcfeb1 100644 --- a/buildtools/qmake/projectconfigurationdlgbase.ui +++ b/buildtools/qmake/projectconfigurationdlgbase.ui @@ -1895,7 +1895,7 @@ unnamed - + Name diff --git a/buildtools/qmake/trolllistview.cpp b/buildtools/qmake/trolllistview.cpp index 3bf99a0e..4f0e3406 100644 --- a/buildtools/qmake/trolllistview.cpp +++ b/buildtools/qmake/trolllistview.cpp @@ -22,7 +22,7 @@ TrollListView::TrollListView(TrollProjectWidget *widget, TQWidget *parent, TrollProjectWidget::TrollProjectView view, const char *name) - :KListView(parent, name), m_widget(widget), m_view(view) + :TDEListView(parent, name), m_widget(widget), m_view(view) { } diff --git a/buildtools/qmake/trolllistview.h b/buildtools/qmake/trolllistview.h index 4fb005d5..13d2d9a1 100644 --- a/buildtools/qmake/trolllistview.h +++ b/buildtools/qmake/trolllistview.h @@ -24,7 +24,7 @@ #include "trollprojectwidget.h" -class TrollListView : public KListView +class TrollListView : public TDEListView { Q_OBJECT diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 69c030b7..a86be38a 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -88,10 +88,10 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS mainWindow()->embedSelectViewRight(m_widget, i18n("TQMake Manager"), i18n("TQMake manager")); - KAction *action; + TDEAction *action; const TQIconSet icon(SmallIcon("compfile")); - action = new KAction( i18n("Compile &File"), "compfile", 0, + action = new TDEAction( i18n("Compile &File"), "compfile", 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildOpenFile()), actionCollection(),"build_compilefile" ); action->setToolTip(i18n("Compile file")); @@ -100,7 +100,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Build Project"), "make_tdevelop", Key_F8, + action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildProject()), actionCollection(), "build_build_project" ); action->setToolTip(i18n("Build project")); @@ -108,7 +108,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Rebuild Project"),"rebuild" , 0, + action = new TDEAction( i18n("&Rebuild Project"),"rebuild" , 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildProject()), actionCollection(),"build_rebuild_project" ); action->setToolTip(i18n("Rebuild project")); @@ -116,7 +116,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Install Project"),"install" , 0, + action = new TDEAction( i18n("&Install Project"),"install" , 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallProject()), actionCollection(),"build_install_project" ); action->setToolTip(i18n("Install project")); @@ -124,7 +124,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Clean Project"), 0, + action = new TDEAction( i18n("&Clean Project"), 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanProject()), actionCollection(), "build_clean_project" ); action->setToolTip(i18n("Clean project")); @@ -132,7 +132,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Dist-Clean Project"), 0, + action = new TDEAction( i18n("&Dist-Clean Project"), 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanProject()), actionCollection(), "build_distclean_project" ); action->setToolTip(i18n("Dist-Clean project")); @@ -140,13 +140,13 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "project directory.
Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("Execute Main Program"), "exec", SHIFT+Key_F9, + action = new TDEAction( i18n("Execute Main Program"), "exec", SHIFT+Key_F9, this, TQT_SLOT(slotBuildAndExecuteProject()), actionCollection(), "build_execute_project" ); action->setToolTip(i18n("Execute main program")); action->setWhatsThis(i18n("Execute program

Executes the currently selected subproject if it is an application or the program specified in project settings, Run Options tab.")); - action = new KAction( i18n("&Build Subproject"), "make_tdevelop", Key_F7, + action = new TDEAction( i18n("&Build Subproject"), "make_tdevelop", Key_F7, TQT_TQOBJECT(m_widget), TQT_SLOT(slotBuildTarget()), actionCollection(), "build_build_target" ); action->setToolTip(i18n("Build subproject")); @@ -155,7 +155,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Rebuild Subproject"), "rebuild", 0, + action = new TDEAction( i18n("&Rebuild Subproject"), "rebuild", 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotRebuildTarget()), actionCollection(),"build_rebuild_target" ); action->setToolTip(i18n("Rebuild subproject")); @@ -164,7 +164,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Install Subproject"), "install", 0, + action = new TDEAction( i18n("&Install Subproject"), "install", 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotInstallTarget()), actionCollection(),"build_install_target" ); action->setToolTip(i18n("Install subproject")); @@ -173,7 +173,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Clean Subproject"), 0, + action = new TDEAction( i18n("&Clean Subproject"), 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotCleanTarget()), actionCollection(), "build_clean_target" ); action->setToolTip(i18n("Clean subproject")); @@ -182,7 +182,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("&Dist-Clean Subproject"), 0, + action = new TDEAction( i18n("&Dist-Clean Subproject"), 0, TQT_TQOBJECT(m_widget), TQT_SLOT(slotDistCleanTarget()), actionCollection(), "build_distclean_target" ); action->setToolTip(i18n("Dist-Clean subproject")); @@ -191,7 +191,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS "Environment variables and make arguments can be specified " "in the project settings dialog, Make Options tab.")); - action = new KAction( i18n("Execute Subproject"), "exec", 0, + action = new TDEAction( i18n("Execute Subproject"), "exec", 0, this, TQT_SLOT(slotBuildAndExecuteTarget()), actionCollection(), "build_execute_target" ); action->setToolTip(i18n("Execute subproject")); diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 77301f95..69f71bd4 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -177,8 +177,8 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) // Project tree connections connect( overview, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ), this, TQT_SLOT( slotOverviewSelectionChanged( TQListViewItem* ) ) ); - connect( overview, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotOverviewContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( overview, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotOverviewContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); ///////////////// @@ -295,8 +295,8 @@ TrollProjectWidget::TrollProjectWidget( TrollProjectPart *part ) this, TQT_SLOT( slotDetailsSelectionChanged( TQListViewItem* ) ) ); connect( details, TQT_SIGNAL( executed( TQListViewItem* ) ), this, TQT_SLOT( slotDetailsExecuted( TQListViewItem* ) ) ); - connect( details, TQT_SIGNAL( contextMenu( KListView*, TQListViewItem*, const TQPoint& ) ), - this, TQT_SLOT( slotDetailsContextMenu( KListView*, TQListViewItem*, const TQPoint& ) ) ); + connect( details, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ), + this, TQT_SLOT( slotDetailsContextMenu( TDEListView*, TQListViewItem*, const TQPoint& ) ) ); connect ( buildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotBuildTarget () ) ); connect ( rebuildTargetButton, TQT_SIGNAL ( clicked () ), this, TQT_SLOT ( slotRebuildTarget () ) ); @@ -553,7 +553,7 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item ) } } -void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl ) +void TrollProjectWidget::buildProjectDetailTree( QMakeScopeItem *item, TDEListView *listviewControl ) { // Insert all GroupItems and all of their children into the view @@ -966,14 +966,14 @@ void TrollProjectWidget::slotRemoveSubproject( QMakeScopeItem *spitem ) } } -void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) +void TrollProjectWidget::slotOverviewContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return ; QMakeScopeItem *spitem = static_cast( item ); - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); popup.insertTitle( i18n( "Subproject %1" ).arg( item->text( 0 ) ) ); int idBuild = -2; @@ -1516,7 +1516,7 @@ void TrollProjectWidget::slotDetailsSelectionChanged( TQListViewItem *item ) } } -void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ) +void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ) { if ( !item ) return ; @@ -1528,7 +1528,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it TQString title, ext; GroupItem::groupTypeMeanings( titem->groupType, title, ext ); - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); popup.insertTitle( title ); int idInsExistingFile = -2; @@ -1755,7 +1755,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it FileItem *fitem = static_cast( pvitem ); GroupItem* gitem = static_cast( item->parent() ); - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); if ( !( gitem->groupType == GroupItem::InstallObject ) ) popup.insertTitle( i18n( "File: %1" ).arg( fitem->text( 0 ) ) ); else diff --git a/buildtools/qmake/trollprojectwidget.h b/buildtools/qmake/trollprojectwidget.h index 1babd746..fdc6ce74 100644 --- a/buildtools/qmake/trollprojectwidget.h +++ b/buildtools/qmake/trollprojectwidget.h @@ -38,7 +38,7 @@ #include "qmakescopeitem.h" class TrollProjectPart; -class KListView; +class TDEListView; class ProjectConfigurationDlg; class TrollProjectWidget : public TQVBox @@ -127,10 +127,10 @@ protected: private slots: void slotOverviewSelectionChanged( TQListViewItem *item ); - void slotOverviewContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); + void slotOverviewContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ); void slotDetailsSelectionChanged( TQListViewItem* ); void slotDetailsExecuted( TQListViewItem *item ); - void slotDetailsContextMenu( KListView *, TQListViewItem *item, const TQPoint &p ); + void slotDetailsContextMenu( TDEListView *, TQListViewItem *item, const TQPoint &p ); void slotExcludeFileFromScopeButton(); void slotAddSubproject( QMakeScopeItem *spitem = 0 ); void slotRemoveSubproject( QMakeScopeItem *spitem = 0 ); @@ -144,7 +144,7 @@ private slots: private: void cleanDetailView( QMakeScopeItem *item ); void runClean( QMakeScopeItem*, const TQString& ); - void buildProjectDetailTree( QMakeScopeItem *item, KListView *listviewControl ); + void buildProjectDetailTree( QMakeScopeItem *item, TDEListView *listviewControl ); void removeFile( QMakeScopeItem *spitem, FileItem *fitem ); void addSubprojectToItem( QMakeScopeItem*, const TQString& ); void setupContext(); @@ -172,7 +172,7 @@ private: TQMap qmakeEnvironment() const; TQVBox *overviewContainer; - KListView *overview; + TDEListView *overview; TQHBox *projectTools; TQToolButton *addSubdirButton; TQToolButton *createScopeButton; @@ -189,7 +189,7 @@ private: TQToolButton *projectconfButton; TQVBox *detailContainer; - KListView *details; + TDEListView *details; TQHBox *fileTools; TQToolButton *addfilesButton; TQToolButton *newfileButton; diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index 293a11c9..1c3ab20b 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -49,14 +49,14 @@ ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const T // only create new file action if file creation part not available if (!extension("TDevelop/CreateFile")) { - KAction *action; - action = new KAction( i18n("New File..."), 0, + TDEAction *action; + action = new TDEAction( i18n("New File..."), 0, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_newfile" ); action->setWhatsThis( i18n("New file

Creates a new file.") ); action->setToolTip( i18n("Create a new file") ); } - new KAction( i18n("Rescan Project"), 0, CTRL+ALT+Key_R, + new TDEAction( i18n("Rescan Project"), 0, CTRL+ALT+Key_R, this, TQT_SLOT(rescan()), actionCollection(), "rescan" ); -- cgit v1.2.1