diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:15:35 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-01 15:15:35 -0600 |
| commit | f78eb03afb8c9a380985d26286afc40b4c89b292 (patch) | |
| tree | 3c087e2f119e645c902958c3bc3c802abf078ad0 | |
| parent | da1941ccadffe5ae70ee111c53f0ec2b3d990869 (diff) | |
| download | tdevelop-f78eb03afb8c9a380985d26286afc40b4c89b292.tar.gz tdevelop-f78eb03afb8c9a380985d26286afc40b4c89b292.zip | |
Rename a number of classes to enhance compatibility with KDE4
306 files changed, 1312 insertions, 1312 deletions
@@ -768,7 +768,7 @@ (IDEAl mode only for now). 2003-06-14 Harald Fernengel <harry@tdevelop.org> - * Added perforce to the main menu, also uses KActions now so you can + * Added perforce to the main menu, also uses TDEActions now so you can assign your favourite keybinding to the commands. 2003-06-14 Hamish Rodda <rodda@kde.org> @@ -1908,7 +1908,7 @@ * Use same menu item for start/continue 2002-06-10 John Firebaugh <jfirebaugh@kde.org> - * New breakpoints widget. Uses KListView. + * New breakpoints widget. Uses TDEListView. * Breakpoints should sync with document much better now. 2002-06-10 Bernd Gehrmann <bernd@linux.local> @@ -2087,7 +2087,7 @@ back and forward * Added splashscreen. Now we need an artist! :-) 2002-04-28 Harald Fernengel <harry@tdevelop.org> - * SourceNavPart now uses KToolBarPopupAction to display nifty + * SourceNavPart now uses TDEToolBarPopupAction to display nifty Konqueror-like drop down menus for source code navigation 2002-04-27 Bernd Gehrmann <bernd@mail.berlios.de> * Context menu actions in auto project act on context 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("<b>Build project</b><p>Executes <b>ant dist</b> 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("<b>Build target</b><p>Executes <b>ant target_name</b> 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("<b>Add icon</b><p>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("<b>Make target active</b><p>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, <b>Make Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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 "<b>Configure Options</b> 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("<b>Run automake && friends</b><p>Executes<br><b>make -f Makefile.cvs</b><br><b>./configure</b><br>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("<b>Update admin module</b><p>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, <b>Make Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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("<b>Build configuration menu</b><p>Allows to switch between project build configurations.<br>" @@ -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<AutoProjectWidget> 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 @@ </widget> </hbox> </widget> - <widget class="KListView" row="1" column="0"> + <widget class="TDEListView" row="1" column="0"> <property name="name"> <cstring>m_listView</cstring> </property> 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 <SubprojectItem> 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.</qt>")); 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("<qt><b>Remove subproject</b><p>Removes the subproject. Asks if the " "subproject should be also removed from disk. Only subprojects " "which do not hold other subprojects can be removed.</qt>")); - 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("<qt><b>Add existing subprojects</b><p>Imports existing " "subprojects containing Makefile.am.</qt>")); @@ -226,7 +226,7 @@ void AutoSubprojectView::initActions() "dialog, <b>Make Options</b> tab.</qt>")); 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("<qt><b>Force Reedit</b><p>Runs <b>make force-reedit</b> " "from the directory of the selected subproject.<br>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("<qt><b>Clean</b><p>Runs <b>make clean</b> from the directory of " "the selected subproject.<br> Environment variables and make " "arguments can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); - 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("<qt><b>Install</b><p>Runs <b>make install</b> from the directory " "of the selected subproject.<br> Environment variables and " "make arguments can be specified in the project settings " "dialog, <b>Make Options</b> tab.</qt>")); - 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("<qt><b>Install as root user</b><p>Runs <b>make install</b> " "command from the directory of the selected subproject " @@ -260,27 +260,27 @@ void AutoSubprojectView::initActions() "can be specified in the project settings dialog, " "<b>Make Options</b> tab.</qt>")); - 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("<qt><b>Manage custom commands</b><p>Allows to create, edit and " "delete custom build commands which appears in the subproject " "context menu.<br></qt>")); - 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<int> 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<TQToolButton*>( 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<TQToolButton*>( w ) ) static_cast<TQToolButton*>( 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 <kaction.h> 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 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <property name="name"> <cstring>newFileList</cstring> </property> 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 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListBox" row="0" column="0"> + <widget class="TDEListBox" row="0" column="0"> <property name="name"> <cstring>dependencyListBox</cstring> </property> 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( "<b>Re-Populate Project</b><p>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, <b>Build Options</b> 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, <b>Make Options</b> 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, <b>Build Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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, <b>Build Options</b> 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( "<b>Execute program</b><p>Executes the main program specified in project settings, <b>Run Options</b> 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( "<b>Make Environment</b><p> Choose the set of environment variables to be passed on to make.<br>" 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 @@ <string>Files to add to the Project:</string> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <property name="name"> <cstring>fileView</cstring> </property> 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 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Variable</string> 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("<b>Build project</b><p>Runs the compiler on a main source file of the project. " "The compiler and the main source file can be set in project settings, <b>Pascal Compiler</b> 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 @@ </widget> </hbox> </widget> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string>Subprojects</string> 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 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Subprojects</string> 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<TQString, TQString> 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 <tqmap.h> 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<TQString, TQString> ); 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 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Name</string> 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, <b>Make Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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.<br>Environment variables and make arguments can be specified " "in the project settings dialog, <b>Make Options</b> 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("<b>Execute program</b><p>Executes the currently selected subproject if it is an application or the program specified in project settings, <b>Run Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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, <b>Make Options</b> 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<QMakeScopeItem*>( 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<FileItem*>( pvitem ); GroupItem* gitem = static_cast<GroupItem*>( 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<TQString,TQString> 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<KDevCreateFile>("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("<b>New file</b><p>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" ); diff --git a/doc/api/FutureTasks.dox b/doc/api/FutureTasks.dox index c738a3f3..1d7f7f26 100644 --- a/doc/api/FutureTasks.dox +++ b/doc/api/FutureTasks.dox @@ -53,7 +53,7 @@ - Build tools Parts - Show .po files in project management - Custom actions for groups, targets and files for project managers: - - any menu item should be a KAction plugged into KPopupMenu, also we need to define shortcuts for any such action, + - any menu item should be a TDEAction plugged into TDEPopupMenu, also we need to define shortcuts for any such action, also we should make sure those actions are properly executed from a shortcut. - AutoProjectPart - Should be able to DND files from other targets / file list / konq to add to targets diff --git a/doc/kde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook index f5af2265..c1ed3ba9 100644 --- a/doc/kde_app_devel/index.docbook +++ b/doc/kde_app_devel/index.docbook @@ -749,7 +749,7 @@ the compilation phase. -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new -c -o kscribble.o `test -f 'kscribble.cpp' || echo '/home/caleb/kscribble/src/'`kscribble.cpp 30 kscribble.cpp: In member function `void KScribble::setupActions()' -31 kscribble.cpp:107: warning: unused variable `KAction*custom' +31 kscribble.cpp:107: warning: unused variable `TDEAction*custom' 32 /usr/lib/qt/bin/moc /home/caleb/kscribble/src/kscribbleview.h -o kscribbleview.moc 33 source='kscribbleview.cpp' object='kscribbleview.o' libtool=no \ 34 depfile='.deps/kscribbleview.Po' tmpdepfile='.deps/kscribbleview.TPo' \ @@ -912,14 +912,14 @@ added some KDE methods that set program and author information for this applicat Let's have a look at the constructor and see how this instance is called <programlisting> 1 KScribble::KScribble() -2 : KMainWindow( 0, "KScribble" ), +2 : TDEMainWindow( 0, "KScribble" ), 3 m_view(new KScribbleView(this)), 4 m_printer(0) 5 { 6 // accept dnd 7 setAcceptDrops(true); 8 -9 // tell the KMainWindow that this is indeed the main widget +9 // tell the TDEMainWindow that this is indeed the main widget 10 setCentralWidget(m_view); 11 12 // then, setup our actions @@ -938,7 +938,7 @@ Let's have a look at the constructor and see how this instance is called </programlisting> </para> <para> -Notice that <classname>KScribble</classname> inherits the <classname>KMainWindow</classname> class - a +Notice that <classname>KScribble</classname> inherits the <classname>TDEMainWindow</classname> class - a commonly used base class for TDE applications. We initialize a class called <classname>KScribbleView</classname> as our central widget, create a <classname>KStatusBar</classname> via the <methodname>statusBar()</methodname> method (line 16), and connect some signals and slots together. @@ -1123,7 +1123,7 @@ The KDE libraries were invented to make designing applications for the K Desktop and capable of more functionality than what Qt alone is offering. The tdeui library offers: <orderedlist> <listitem><para> -KListView: a more powerful version of <classname>QListView</classname> +TDEListView: a more powerful version of <classname>QListView</classname> </para></listitem> <listitem><para> KIconView: a graphical viewer of icon files @@ -1164,9 +1164,9 @@ icons or provide quick access methods like combos to select values. <sect1 id="c5s2"> <title>How does it work?</title> <para> -Our application inherits the <classname>KMainWindow</classname> class, which automatically handles creating +Our application inherits the <classname>TDEMainWindow</classname> class, which automatically handles creating a menu bar and tool bars for us. In the <methodname>KScribble::setupActions()</methodname> method there is -a call to <methodname>KMainWindow::createGUI()</methodname>. This method loads a resource file, in this +a call to <methodname>TDEMainWindow::createGUI()</methodname>. This method loads a resource file, in this case kscribbleui.rc, to initialize menus at startup. Note that kscribbleui.rc is listed as one of the project files in the Automake Manager. Opening that file up reveals this: <programlisting> @@ -1192,7 +1192,7 @@ a large number of <methodname>insertItem()</methodname> methods which allow you menu bar. </para> <para> -<classname>KMainWindow</classname>'s methods <methodname>statusBar()</methodname> and <methodname> +<classname>TDEMainWindow</classname>'s methods <methodname>statusBar()</methodname> and <methodname> toolBar()</methodname> will also provide you with applicable widgets. </para> </sect1> @@ -1202,7 +1202,7 @@ toolBar()</methodname> will also provide you with applicable widgets. A very professional thing you should always add to your application are keyboard accelerators. Those are mainly used by experienced users that want to work fast with their applications and are willing to learn shortcuts. For this, the KDE libraries provide the class <classname> -KAction</classname>, which provides the keyboard accelerator keys and access to global configured +TDEAction</classname>, which provides the keyboard accelerator keys and access to global configured standard keyboard accelerators. </para> <para> @@ -1249,7 +1249,7 @@ Within the application, those are:</para> <para> Additionally, the application should provide means to access a HTML-based online manual directly using the standard help key F1. This context based help system is provided automatically through the -<classname>KMainWindow</classname> class, though as the author you must provide the content. +<classname>TDEMainWindow</classname> class, though as the author you must provide the content. </para> <para> As &tdevelop; also offers all types of help as well as the KDE framework generated by the @@ -1273,7 +1273,7 @@ as possible because toolbars can be configured to display their contents in vari either displaying the button, button with text on the right, button with text below, text only. This possibility should be made configurable by the user, but isn't a must-be. The text is shown as a tool-tip anyway and a toolbar usually consists of buttons and other widgets like lineedits and -combo boxes. For a complete reference, see the <classname>KToolBar</classname> class reference located +combo boxes. For a complete reference, see the <classname>TDEToolBar</classname> class reference located in the tdeui library. </para> <para> @@ -1291,7 +1291,7 @@ provided by Qt. An example of that would be: <sect1 id="c8s3"> <title>Extending the Statusbar</title> <para> -As the applications that inherit <classname>KMainWindow</classname> contain a statusbar as well, +As the applications that inherit <classname>TDEMainWindow</classname> contain a statusbar as well, it also offers a set of statusbar messages already for all menu and toolbar items. A statusbar help message is a short message that extends the meaning of a tool-tip or can be seen as a replacement for a tool-tip over menubar items and is (as the name suggests) displayed in the statusbar when the user diff --git a/doc/kdearch/index.docbook b/doc/kdearch/index.docbook index 53e7ff7a..7f035d77 100644 --- a/doc/kdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -285,13 +285,13 @@ throughout the desktop. <itemizedlist> -<listitem><formalpara><title><ulink url="kdeapi:tdecore/KAccel">KAccel</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEAccel">TDEAccel</ulink></title> <para> Collection of keyboard shortcuts. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdecore/KStdAccel">KStdAccel</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdecore/TDEStdAccel">TDEStdAccel</ulink></title> <para> Easy access to the common keyboard shortcut keys. </para> @@ -401,25 +401,25 @@ Widgets - widget classes for list views, rules, color selection etc. <itemizedlist> -<listitem><formalpara><title><ulink url="kdeapi:tdeui/KListView">KListView</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeui/TDEListView">TDEListView</ulink></title> <para> A variant of <classname>QListView</classname> that honors KDE's system-wide settings. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdeui/KListView">KListBox</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeui/TDEListView">TDEListBox</ulink></title> <para> A variant of <classname>QListBox</classname> that honors KDE's system-wide settings. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdeui/KListView">KIconView</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeui/TDEListView">KIconView</ulink></title> <para> A variant of <classname>QIconView</classname> that honors KDE's system-wide settings. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdeui/KListView">KLineEdit</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeui/TDEListView">KLineEdit</ulink></title> <para> A variant of <classname>QLineEdit</classname> with completion support. </para> @@ -431,7 +431,7 @@ A variant of <classname>QComboBox</classname> with completion support. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdeui/KFontCombo">KFontCombo</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeui/TDEFontCombo">TDEFontCombo</ulink></title> <para> A combo box for selecting fonts. </para> @@ -506,7 +506,7 @@ A color selection dialog. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdeui/KFontDialog">KFontDialog</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeui/TDEFontDialog">TDEFontDialog</ulink></title> <para> A font selection dialog. </para> @@ -574,13 +574,13 @@ Actions and XML GUI <itemizedlist> -<listitem><formalpara><title><ulink url="kdeapi:tdeui/KAction">KAction</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeui/TDEAction">TDEAction</ulink></title> <para> Abstraction for an action that can be plugged into menu bars and tool bars. </para> </formalpara></listitem> -<listitem><formalpara><title><ulink url="kdeapi:tdeui/KActionCollection">KActionCollection</ulink></title> +<listitem><formalpara><title><ulink url="kdeapi:tdeui/TDEActionCollection">TDEActionCollection</ulink></title> <para> A set of actions. </para> @@ -1366,7 +1366,7 @@ come from many different plugins or parts. <para> KDE's class for toplevel windows, -<ulink url="kdeapi:tdeui/KMainWindow.html">KMainWindow</ulink>, +<ulink url="kdeapi:tdeui/TDEMainWindow.html">TDEMainWindow</ulink>, inherits <ulink url="kdeapi:tdeui/KXMLGUIClient.html">KXMLGUIClient</ulink> and therefore supports XMLGUI out of the box. All actions created within it must @@ -1423,19 +1423,19 @@ The corresponding part of the setup in C++ is: KStdAction::zoomIn ( this, SLOT(slotZoomIn()), actionCollection() ); KStdAction::zoomOut ( this, SLOT(slotZoomOut()), actionCollection() ); KStdAction::zoom ( this, SLOT(slotZoom()), actionCollection() ); - new KAction ( i18n("&Half size"), ALT+Key_0, + new TDEAction ( i18n("&Half size"), ALT+Key_0, this, SLOT(slotHalfSize()), actionCollection(), "zoom50" ); - new KAction ( i18n("&Normal size"), ALT+Key_1, + new TDEAction ( i18n("&Normal size"), ALT+Key_1, this, SLOT(slotDoubleSize()), actionCollection(), "zoom100" ); - new KAction ( i18n("&Double size"), ALT+Key_2, + new TDEAction ( i18n("&Double size"), ALT+Key_2, this, SLOT(slotDoubleSize()), actionCollection(), "zoom200" ); - new KAction ( i18n("&Fill Screen"), ALT+Key_3, + new TDEAction ( i18n("&Fill Screen"), ALT+Key_3, this, SLOT(slotFillScreen()), actionCollection(), "zoomMaxpect" ); - new KAction ( i18n("Fullscreen &Mode"), CTRL+SHIFT+Key_F, + new TDEAction ( i18n("Fullscreen &Mode"), CTRL+SHIFT+Key_F, this, SLOT(slotFullScreen()), actionCollection(), "fullscreen" ); </programlisting> @@ -1623,7 +1623,7 @@ void MainWindow::updateOpenWithActions() unplugActionList("openwith"); openWithActions.clear(); for ( /* iterate over the relevant services */ ) { - KAction *action = new KAction( ...); + TDEAction *action = new TDEAction( ...); openWithActions.append(action); } plugActionList("openwith", openWithActions); @@ -1769,11 +1769,11 @@ QToolTip::add(w, i18n("This widget does something.")) <para> If the menu bars and tool bars are created using the <ulink url="actionpattern.html"> action pattern</ulink>, the string used as tooltip is derived from the first argument -of the <ulink url="kdeapi:tdeui/KAction.html">KAction</ulink> constructor: +of the <ulink url="kdeapi:tdeui/TDEAction.html">TDEAction</ulink> constructor: </para> <programlisting> -action = new KAction(i18n("&Delete"), "editdelete", +action = new TDEAction(i18n("&Delete"), "editdelete", SHIFT+Key_Delete, actionCollection(), "del") </programlisting> diff --git a/doc/tdevelop/getting-started.docbook b/doc/tdevelop/getting-started.docbook index 9a5937bd..a805f393 100644 --- a/doc/tdevelop/getting-started.docbook +++ b/doc/tdevelop/getting-started.docbook @@ -1426,18 +1426,18 @@ window find the following lines.</para> <programlisting> Hello::Hello() - : KMainWindow( 0, "Hello" ) + : TDEMainWindow( 0, "Hello" ) { </programlisting> -<para>Right click on <classname>KMainWindow</classname>. +<para>Right click on <classname>TDEMainWindow</classname>. A menu will pop up. There select the <guimenuitem>Search in Documentation: -KMainWindow</guimenuitem> entry and release the mouse button. Now the +TDEMainWindow</guimenuitem> entry and release the mouse button. Now the <guilabel>Documentation</guilabel> tool view will open, showing the -<classname>KMainWindow</classname> entry as search item on the +<classname>TDEMainWindow</classname> entry as search item on the <guilabel>Search</guilabel> sub-page. And a short while after another editor window will open in the workspace area, showing the KDE API Reference page of -the <classname>KMainWindow</classname> class.</para> +the <classname>TDEMainWindow</classname> class.</para> <para>This all will look like the following. (We deliberately opened the <guilabel>Documentation</guilabel>, <guilabel>Search</guilabel> page already to @@ -1454,11 +1454,11 @@ identifier.</para></caption> </screenshot> <para>You might as well select <guimenuitem>Find Documentation: -KMainWindow</guimenuitem>. In this case the <guilabel>Finder</guilabel> sub-page +TDEMainWindow</guimenuitem>. In this case the <guilabel>Finder</guilabel> sub-page of the <guilabel>Documentation</guilabel> tool view will show up, usually providing a selection of pages containing the search term. (In our example this -will probably be the <classname>KMainWindow</classname> and -<classname>KMainWindowInterface</classname> classes. Select the one you are +will probably be the <classname>TDEMainWindow</classname> and +<classname>TDEMainWindowInterface</classname> classes. Select the one you are interested in and the corresponding documentation will be displayed in an editor window.</para> @@ -1573,7 +1573,7 @@ Hello</guilabel>, and &tdevelop; will immediately open the front of this class definition:</para> <programlisting> Hello::Hello() - : KMainWindow( 0, "Hello" ) + : TDEMainWindow( 0, "Hello" ) { </programlisting> </listitem> @@ -2127,7 +2127,7 @@ comment marks will be recognized as well.</para> <filename>hello.cpp</filename> example file</para> <programlisting> Hello::Hello() - : KMainWindow( 0, "Hello" ) + : TDEMainWindow( 0, "Hello" ) { // set the shell's ui resource file // TODO check the user interface diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp index 0416bcc1..da232a4e 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.cpp +++ b/embedded/visualboyadvance/visualboyadvance_part.cpp @@ -29,8 +29,8 @@ VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, c setXMLFile("kdevpart_visualboyadvance.rc"); - KAction *action; - action = new KAction( i18n("Execute Program"), "exec", Key_F9, + TDEAction *action; + action = new TDEAction( i18n("Execute Program"), "exec", Key_F9, this, TQT_SLOT(slotExecute()), actionCollection(), "build_execute" ); diff --git a/kdevdesigner/designer/kdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp index 2e84b2ad..8e639dc8 100644 --- a/kdevdesigner/designer/kdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -86,7 +86,7 @@ static TQIconSet createPartIconSet( const TQString &name ) void KDevDesignerPart::setupActions( ) { - KAction *action; + TDEAction *action; action = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); action = KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection()); action = KStdAction::close(this, TQT_SLOT(fileClose()), actionCollection()); @@ -95,9 +95,9 @@ void KDevDesignerPart::setupActions( ) stateSync(action, m_widget->actionFileSave); action = KStdAction::saveAs(this, TQT_SLOT(fileSaveAs()), actionCollection()); stateSync(action, m_widget->actionFileSaveAs); - action = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(fileSaveAs()), actionCollection(), "file_saveall"); + action = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(fileSaveAs()), actionCollection(), "file_saveall"); stateSync(action, m_widget->actionFileSaveAll); - new KAction(i18n("Create &Template..."), 0, this, TQT_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate"); + new TDEAction(i18n("Create &Template..."), 0, this, TQT_SLOT(fileCreateTemplate()), actionCollection(), "file_createtemplate"); action = KStdAction::undo(this, TQT_SLOT(editUndo()), actionCollection()); stateSync(action, m_widget->actionEditUndo); @@ -109,63 +109,63 @@ void KDevDesignerPart::setupActions( ) stateSync(action, m_widget->actionEditCopy); action = KStdAction::paste(this, TQT_SLOT(editPaste()), actionCollection()); stateSync(action, m_widget->actionEditPaste); - action = new KAction(i18n("&Delete"), Key_Delete, this, TQT_SLOT(editDelete()), actionCollection(), "edit_delete"); + action = new TDEAction(i18n("&Delete"), Key_Delete, this, TQT_SLOT(editDelete()), actionCollection(), "edit_delete"); stateSync(action, m_widget->actionEditDelete); action = KStdAction::selectAll(this, TQT_SLOT(editSelectAll()), actionCollection()); stateSync(action, m_widget->actionEditSelectAll); - action = new KAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()), actionCollection(), "edit_accels"); + action = new TDEAction(i18n("Chec&k Accelerators"), ALT + Key_R, this, TQT_SLOT(editAccels()), actionCollection(), "edit_accels"); stateSync(action, m_widget->actionEditAccels); - action = new KAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQT_SLOT(editFunctions()), actionCollection(), "edit_functions"); + action = new TDEAction(i18n("S&lots..."), createPartIconSet("designer_editslots.png"), 0, this, TQT_SLOT(editFunctions()), actionCollection(), "edit_functions"); stateSync(action, m_widget->actionEditFunctions); - action = new KAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQT_SLOT(editConnections()), actionCollection(), "edit_connections"); + action = new TDEAction(i18n("Co&nnections..."), createPartIconSet("designer_connecttool.png"), 0, this, TQT_SLOT(editConnections()), actionCollection(), "edit_connections"); stateSync(action, m_widget->actionEditConnections); - action = new KAction(i18n("&Form Settings..."), 0, this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_formsettings"); + action = new TDEAction(i18n("&Form Settings..."), 0, this, TQT_SLOT(editFormSettings()), actionCollection(), "edit_formsettings"); stateSync(action, m_widget->actionEditFormSettings); - action = new KAction(i18n("&Add File..."), 0, this, TQT_SLOT(projectAddFile()), actionCollection(), "project_addfile"); + action = new TDEAction(i18n("&Add File..."), 0, this, TQT_SLOT(projectAddFile()), actionCollection(), "project_addfile"); stateSync(action, m_widget->actionProjectAddFile); - action = new KAction(i18n("&Image Collection..."), 0, this, TQT_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection"); + action = new TDEAction(i18n("&Image Collection..."), 0, this, TQT_SLOT(projectImageCollection()), actionCollection(), "project_imagecollection"); stateSync(action, m_widget->actionEditPixmapCollection); - action = new KAction(i18n("&Database Connections..."), 0, this, TQT_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections"); + action = new TDEAction(i18n("&Database Connections..."), 0, this, TQT_SLOT(projectDatabaseCollections()), actionCollection(), "project_databasecollections"); stateSync(action, m_widget->actionEditDatabaseConnections); - action = new KAction(i18n("&Designer Project Settings..."), 0, this, TQT_SLOT(projectSettings()), actionCollection(), "project_settings"); + action = new TDEAction(i18n("&Designer Project Settings..."), 0, this, TQT_SLOT(projectSettings()), actionCollection(), "project_settings"); stateSync(action, m_widget->actionEditProjectSettings); - KRadioAction *toggle; - toggle = new KRadioAction(i18n("&Pointer"), createPartIconSet("designer_pointer.png"), Key_F2, actionCollection(), "tools_pointer"); + TDERadioAction *toggle; + toggle = new TDERadioAction(i18n("&Pointer"), createPartIconSet("designer_pointer.png"), Key_F2, actionCollection(), "tools_pointer"); setupToolsAction(toggle, m_widget->actionPointerTool); pointerAction = toggle; - toggle = new KRadioAction(i18n("&Connect Signal/Slots"), createPartIconSet("designer_connecttool.png"), Key_F3, actionCollection(), "tools_connect"); + toggle = new TDERadioAction(i18n("&Connect Signal/Slots"), createPartIconSet("designer_connecttool.png"), Key_F3, actionCollection(), "tools_connect"); setupToolsAction(toggle, m_widget->actionConnectTool); - toggle = new KRadioAction(i18n("Tab &Order"), createPartIconSet("designer_ordertool.png"), Key_F4, actionCollection(), "tools_taborder"); + toggle = new TDERadioAction(i18n("Tab &Order"), createPartIconSet("designer_ordertool.png"), Key_F4, actionCollection(), "tools_taborder"); setupToolsAction(toggle, m_widget->actionOrderTool); - toggle = new KRadioAction(i18n("Set &Buddy"), createPartIconSet("designer_setbuddy.png"), Key_F12, actionCollection(), "tools_setbuddy"); + toggle = new TDERadioAction(i18n("Set &Buddy"), createPartIconSet("designer_setbuddy.png"), Key_F12, actionCollection(), "tools_setbuddy"); setupToolsAction(toggle, m_widget->actionBuddyTool); - new KAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox"); - new KAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets"); + new TDEAction(i18n("Configure Toolbox..."), 0, this, TQT_SLOT(toolsConfigureToolbox()), actionCollection(), "tools_toolbox"); + new TDEAction(i18n("Edit &Custom Widgets..."), 0, this, TQT_SLOT(toolsEditCustomWidgets()), actionCollection(), "tools_editcustomwidgets"); - action = new KAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize"); + action = new TDEAction(i18n("Adjust &Size"), createPartIconSet("designer_adjustsize.png"), CTRL + Key_J, this, TQT_SLOT(layoutAdjustSize()), actionCollection(), "layout_adjustsize"); stateSync(action, m_widget->actionEditAdjustSize); - action = new KAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h"); + action = new TDEAction(i18n("Lay Out &Horizontally"), createPartIconSet("designer_edithlayout.png"), CTRL + Key_H, this, TQT_SLOT(layoutHLayout()), actionCollection(), "layout_h"); stateSync(action, m_widget->actionEditHLayout); - action = new KAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v"); + action = new TDEAction(i18n("Lay Out &Vertically"), createPartIconSet("designer_editvlayout.png"), CTRL + Key_V, this, TQT_SLOT(layoutVLayout()), actionCollection(), "layout_v"); stateSync(action, m_widget->actionEditVLayout); - action = new KAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid"); + action = new TDEAction(i18n("Lay Out in &Grid"), createPartIconSet("designer_editgrid.png"), CTRL + Key_G, this, TQT_SLOT(layoutGridLayout()), actionCollection(), "layout_grid"); stateSync(action, m_widget->actionEditGridLayout); - action = new KAction(i18n("Lay OutQt::Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith"); + action = new TDEAction(i18n("Lay OutQt::Horizontally (in S&plitter)"), createPartIconSet("designer_editvlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitHLayout()), actionCollection(), "layout_splith"); stateSync(action, m_widget->actionEditSplitHorizontal); - action = new KAction(i18n("Lay OutQt::Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv"); + action = new TDEAction(i18n("Lay OutQt::Vertically (in Sp&litter)"), createPartIconSet("designer_edithlayoutsplit.png"), 0, this, TQT_SLOT(layoutSplitVLayout()), actionCollection(), "layout_splitv"); stateSync(action, m_widget->actionEditSplitVertical); - action = new KAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break"); + action = new TDEAction(i18n("&Break Layout"), createPartIconSet("designer_editbreaklayout.png"), CTRL + Key_B, this, TQT_SLOT(layoutBreak()), actionCollection(), "layout_break"); stateSync(action, m_widget->actionEditBreakLayout); - toggle = new KRadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer"); + toggle = new TDERadioAction(i18n("Add Spacer"), createPartIconSet("designer_spacer.png"), 0, actionCollection(), "layout_spacer"); setupToolsAction(toggle, m_widget->actionInsertSpacer); - action = new KAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview"); + action = new TDEAction(i18n("Preview &Form"), CTRL + Key_T, this, TQT_SLOT(windowPreview()), actionCollection(), "window_preview"); stateSync(action, m_widget->actionPreview); - action = new KAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQT_SLOT(windowNext()), actionCollection(), "window_next"); + action = new TDEAction(i18n("Ne&xt Form"), CTRL + Key_F6, this, TQT_SLOT(windowNext()), actionCollection(), "window_next"); stateSync(action, m_widget->actionWindowNext); - action = new KAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQT_SLOT(windowPrev()), actionCollection(), "window_prev"); + action = new TDEAction(i18n("Pre&vious Form"), CTRL + SHIFT + Key_F6, this, TQT_SLOT(windowPrev()), actionCollection(), "window_prev"); stateSync(action, m_widget->actionWindowPrevious); action = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection()); @@ -184,7 +184,7 @@ void KDevDesignerPart::setReadWrite(bool rw) void KDevDesignerPart::setModified(bool modified) { -/* KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); +/* TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); if (!save) return; if (modified) @@ -209,7 +209,7 @@ bool KDevDesignerPart::saveFile() return true; } -void KDevDesignerPart::stateSync( KAction * kaction, TQAction * qaction ) +void KDevDesignerPart::stateSync( TDEAction * kaction, TQAction * qaction ) { if (!qaction) return; @@ -220,7 +220,7 @@ void KDevDesignerPart::stateSync( KAction * kaction, TQAction * qaction ) connect(ac, TQT_SIGNAL(actionEnabled(bool )), kaction, TQT_SLOT(setEnabled(bool ))); } -void KDevDesignerPart::setupToolsAction( KRadioAction * toggle, TQAction * action ) +void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action ) { if (!action) return; @@ -475,7 +475,7 @@ void KDevDesignerPart::setToggleActionChecked( bool b) pointerAction->setChecked(true); return; } - KRadioAction *kaction = m_actionMap[action]; + TDERadioAction *kaction = m_actionMap[action]; if (!kaction) return; // kdDebug() << "untoggle action: " << kaction->text() << endl; @@ -488,7 +488,7 @@ void KDevDesignerPart::setToggleActionOn( bool b ) { if (!sender()) return; - const KRadioAction *action = dynamic_cast<const KRadioAction *>(sender()); + const TDERadioAction *action = dynamic_cast<const TDERadioAction *>(sender()); if (!action) return; // kdDebug() << (b?TQString("toggle"):TQString("untoggle")) << " action: " << action->text() << endl; diff --git a/kdevdesigner/designer/kdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h index 48c0205e..d7c9bf3c 100644 --- a/kdevdesigner/designer/kdevdesigner_part.h +++ b/kdevdesigner/designer/kdevdesigner_part.h @@ -32,9 +32,9 @@ class TQWidget; class TQPainter; class KURL; class MainWindow; -class KAction; +class TDEAction; class TQAction; -class KRadioAction; +class TDERadioAction; class KDevDesignerPart : public KInterfaceDesigner::Designer { @@ -70,8 +70,8 @@ protected: void setupDesignerWindow(); void setupActions(); - void stateSync(KAction *kaction, TQAction *qaction); - void setupToolsAction(KRadioAction *toggle, TQAction *action); + void stateSync(TDEAction *kaction, TQAction *qaction); + void setupToolsAction(TDERadioAction *toggle, TQAction *action); protected slots: void setToggleActionChecked(bool b); @@ -120,9 +120,9 @@ protected slots: private: MainWindow *m_widget; - TQMap<const TQAction*, KRadioAction*> m_actionMap; - TQMap<const KRadioAction*, TQAction*> m_actionMap2; - KRadioAction* pointerAction; + TQMap<const TQAction*, TDERadioAction*> m_actionMap; + TQMap<const TDERadioAction*, TQAction*> m_actionMap2; + TDERadioAction* pointerAction; }; class TDEInstance; diff --git a/kdevdesigner/src/kdevdesigner.h b/kdevdesigner/src/kdevdesigner.h index 2fda0a78..76397bec 100644 --- a/kdevdesigner/src/kdevdesigner.h +++ b/kdevdesigner/src/kdevdesigner.h @@ -29,7 +29,7 @@ #include <kapplication.h> #include <tdeparts/mainwindow.h> -class KToggleAction; +class TDEToggleAction; /** * This is the application "Shell". It has a menubar, toolbar, and @@ -90,8 +90,8 @@ private: private: KParts::ReadWritePart *m_part; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; }; #endif // _KDEVDESIGNER_H_ diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index 4ac60e3e..be27d0c2 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -42,8 +42,8 @@ BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStr setInstance(BashSupportFactory::instance()); setXMLFile("kdevbashsupport.rc"); - KAction *action; - action = new KAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + TDEAction *action; + action = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Starts an application.")); diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index cefcc605..f4c4cba2 100644 --- a/languages/cpp/app_templates/kapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp @@ -26,14 +26,14 @@ #include <kstdaction.h> %{APPNAME}::%{APPNAME}() - : KMainWindow( 0, "%{APPNAME}" ), + : TDEMainWindow( 0, "%{APPNAME}" ), m_view(new %{APPNAME}View(this)), m_printer(0) { // accept dnd setAcceptDrops(true); - // tell the KMainWindow that this is indeed the main widget + // tell the TDEMainWindow that this is indeed the main widget setCentralWidget(m_view); // then, setup our actions @@ -99,7 +99,7 @@ void %{APPNAME}::setupActions() // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item - KAction *custom = new KAction(i18n("Cus&tom Menuitem"), 0, + TDEAction *custom = new TDEAction(i18n("Cus&tom Menuitem"), 0, this, TQT_SLOT(optionsPreferences()), actionCollection(), "custom_action"); } diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h index 2085e6e6..007a5db0 100644 --- a/languages/cpp/app_templates/kapp/app.h +++ b/languages/cpp/app_templates/kapp/app.h @@ -23,7 +23,7 @@ class KURL; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAME} : public KMainWindow +class %{APPNAME} : public TDEMainWindow { Q_OBJECT diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp index 9ef7ccc7..b9d5a9b4 100644 --- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp @@ -54,7 +54,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) /// @todo doesn't this have to be deleted? PluginView *view = new PluginView (); - (void) new KAction ( i18n("Insert Hello World"), 0, this, + (void) new TDEAction ( i18n("Insert Hello World"), 0, this, TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp index 008db5a8..269a6b9e 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp +++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp @@ -58,7 +58,7 @@ void KatePlugin%{APPNAME}::addView(Kate::MainWindow *win) /// @todo doesn't this have to be deleted? PluginView *view = new PluginView (); - (void) new KAction ( i18n("Insert Hello World"), 0, this, + (void) new TDEAction ( i18n("Insert Hello World"), 0, this, TQT_SLOT( slotInsertHello() ), view->actionCollection(), "edit_insert_%{APPNAMELC}" ); diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp index b6a93a2b..0cbd25ed 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4.cpp @@ -53,7 +53,7 @@ void %{APPNAME}::setupActions() TDEStandardAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View - KAction *custom = new KAction(KIcon("colorize"), i18n("Swi&tch Colors"), this); + TDEAction *custom = new TDEAction(KIcon("colorize"), i18n("Swi&tch Colors"), this); actionCollection()->addAction( TQLatin1String("switch_action"), custom ); connect(custom, TQT_SIGNAL(triggered(bool)), m_view, TQT_SLOT(switchColors())); } diff --git a/languages/cpp/app_templates/kde4app/kapp4.h b/languages/cpp/app_templates/kde4app/kapp4.h index 68799e3c..3c209de2 100644 --- a/languages/cpp/app_templates/kde4app/kapp4.h +++ b/languages/cpp/app_templates/kde4app/kapp4.h @@ -9,7 +9,7 @@ class %{APPNAME}View; class KPrinter; -class KToggleAction; +class TDEToggleAction; class KUrl; /** @@ -47,8 +47,8 @@ private: %{APPNAME}View *m_view; KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; }; #endif // _%{APPNAMELC}_H_ diff --git a/languages/cpp/app_templates/kdedcop/app.cpp b/languages/cpp/app_templates/kdedcop/app.cpp index e4fa554f..0548f6bd 100644 --- a/languages/cpp/app_templates/kdedcop/app.cpp +++ b/languages/cpp/app_templates/kdedcop/app.cpp @@ -8,7 +8,7 @@ #include <klocale.h> %{APPNAME}::%{APPNAME}() - : KMainWindow( 0, "%{APPNAME}" ) + : TDEMainWindow( 0, "%{APPNAME}" ) { m_mainClass = new MainClass(); } diff --git a/languages/cpp/app_templates/kdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h index 19489d45..5e533c50 100644 --- a/languages/cpp/app_templates/kdedcop/app.h +++ b/languages/cpp/app_templates/kdedcop/app.h @@ -16,7 +16,7 @@ * @author %{AUTHOR} <%{EMAIL}> * @version 0.1 */ -class %{APPNAME} : public KMainWindow +class %{APPNAME} : public TDEMainWindow { Q_OBJECT diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 364ec0d7..ce011498 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -28,7 +28,7 @@ static const KDevPluginInfo data("kdev%{APPNAMELC}"); setXMLFile("kdevlang_%{APPNAMELC}.rc"); - m_build = new KAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); kdDebug() << "Creating %{APPNAMELC} Part" << endl; diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h index f6439768..1cce0fa6 100644 --- a/languages/cpp/app_templates/kdevlang/kdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -10,7 +10,7 @@ #include <tqstringlist.h> #include <kdialogbase.h> -class KAction; +class TDEAction; /* Please read the README.dox file for more info about this part @@ -37,7 +37,7 @@ class %{APPNAME}Part : public KDevLanguageSupport void parse(); void slotActivePartChanged(KParts::Part *part); private: - KAction *m_build; + TDEAction *m_build; }; diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index 082549c4..62ab3d94 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -91,7 +91,7 @@ void %{APPNAME}Part::init() void %{APPNAME}Part::setupActions() { // create XMLGUI actions here - action = new KAction(i18n("&Do Something..."), 0, + action = new TDEAction(i18n("&Do Something..."), 0, this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do.")); diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h index 482df00f..9414d448 100644 --- a/languages/cpp/app_templates/kdevpart/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -7,7 +7,7 @@ #include <tqguardedptr.h> class TQPopupMenu; -class KAction; +class TDEAction; class KDialogBase; class Context; class ConfigWidgetProxy; @@ -37,7 +37,7 @@ private slots: private: void setupActions(); - KAction *action; + TDEAction *action; TQGuardedPtr<%{APPNAME}Widget> m_widget; ConfigWidgetProxy *m_configProxy; diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 082549c4..62ab3d94 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -91,7 +91,7 @@ void %{APPNAME}Part::init() void %{APPNAME}Part::setupActions() { // create XMLGUI actions here - action = new KAction(i18n("&Do Something..."), 0, + action = new TDEAction(i18n("&Do Something..."), 0, this, TQT_SLOT(doSomething()), actionCollection(), "plugin_action" ); action->setToolTip(i18n("Do something")); action->setWhatsThis(i18n("<b>Do something</b><p>Describe here what does this action do.")); diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index 482df00f..9414d448 100644 --- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -7,7 +7,7 @@ #include <tqguardedptr.h> class TQPopupMenu; -class KAction; +class TDEAction; class KDialogBase; class Context; class ConfigWidgetProxy; @@ -37,7 +37,7 @@ private slots: private: void setupActions(); - KAction *action; + TDEAction *action; TQGuardedPtr<%{APPNAME}Widget> m_widget; ConfigWidgetProxy *m_configProxy; diff --git a/languages/cpp/app_templates/khello/app.cpp b/languages/cpp/app_templates/khello/app.cpp index 811f9337..72b9e2dc 100644 --- a/languages/cpp/app_templates/khello/app.cpp +++ b/languages/cpp/app_templates/khello/app.cpp @@ -8,7 +8,7 @@ #include <klocale.h> %{APPNAME}::%{APPNAME}() - : KMainWindow( 0, "%{APPNAME}" ) + : TDEMainWindow( 0, "%{APPNAME}" ) { // set the shell's ui resource file setXMLFile("%{APPNAMELC}ui.rc"); diff --git a/languages/cpp/app_templates/khello/app.h b/languages/cpp/app_templates/khello/app.h index f8617bab..a3e4bd31 100644 --- a/languages/cpp/app_templates/khello/app.h +++ b/languages/cpp/app_templates/khello/app.h @@ -14,7 +14,7 @@ * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAME} : public KMainWindow +class %{APPNAME} : public TDEMainWindow { Q_OBJECT diff --git a/languages/cpp/app_templates/khello2/app.cpp b/languages/cpp/app_templates/khello2/app.cpp index 948a98fc..e506490b 100644 --- a/languages/cpp/app_templates/khello2/app.cpp +++ b/languages/cpp/app_templates/khello2/app.cpp @@ -7,7 +7,7 @@ #include "%{APPNAMELC}widget.h" %{APPNAME}::%{APPNAME}() - : KMainWindow( 0, "%{APPNAME}" ) + : TDEMainWindow( 0, "%{APPNAME}" ) { setCentralWidget( new %{APPNAME}Widget( this ) ); } diff --git a/languages/cpp/app_templates/khello2/app.h b/languages/cpp/app_templates/khello2/app.h index f8617bab..a3e4bd31 100644 --- a/languages/cpp/app_templates/khello2/app.h +++ b/languages/cpp/app_templates/khello2/app.h @@ -14,7 +14,7 @@ * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAME} : public KMainWindow +class %{APPNAME} : public TDEMainWindow { Q_OBJECT diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp index f32707a8..26b70e3d 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp +++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp @@ -20,7 +20,7 @@ setXMLFile( "%{APPNAMELC}.rc" ); KStdAction::cut(this, TQT_SLOT( cut() ), actionCollection(), "cut" ); // Note: Prefer KStdAction::* to any custom action if possible. - //m_cut = new KAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ), + //m_cut = new TDEAction( i18n("&Cut"), "editcut", 0, this, TQT_SLOT( cut() ), // actionCollection(), "cut"); } diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.h b/languages/cpp/app_templates/kofficepart/kopart_view.h index c6853333..a7e0fd50 100644 --- a/languages/cpp/app_templates/kofficepart/kopart_view.h +++ b/languages/cpp/app_templates/kofficepart/kopart_view.h @@ -8,7 +8,7 @@ #include <koView.h> -class KAction; +class TDEAction; class TQPaintEvent; class %{APPNAME}Part; @@ -29,7 +29,7 @@ protected: virtual void updateReadWrite( bool readwrite ); private: - //KAction* m_cut; + //TDEAction* m_cut; }; #endif diff --git a/languages/cpp/app_templates/kpartapp/app.h b/languages/cpp/app_templates/kpartapp/app.h index 6b470b92..c64525c6 100644 --- a/languages/cpp/app_templates/kpartapp/app.h +++ b/languages/cpp/app_templates/kpartapp/app.h @@ -9,7 +9,7 @@ #include <kapplication.h> #include <tdeparts/mainwindow.h> -class KToggleAction; +class TDEToggleAction; /** * This is the application "Shell". It has a menubar, toolbar, and @@ -70,8 +70,8 @@ private: private: KParts::ReadWritePart *m_part; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; }; #endif // _%{APPNAMEUC}_H_ diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp index 518d4514..0187646e 100644 --- a/languages/cpp/app_templates/kpartapp/app_part.cpp +++ b/languages/cpp/app_templates/kpartapp/app_part.cpp @@ -63,7 +63,7 @@ void %{APPNAME}Part::setReadWrite(bool rw) void %{APPNAME}Part::setModified(bool modified) { // get a handle on our Save action and make sure it is valid - KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); + TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); if (!save) return; diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp index b6297139..3941fa56 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp +++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp @@ -13,7 +13,7 @@ Plugin%{APPNAME}::Plugin%{APPNAME}( TQObject* parent, const char* name ) { // Instantiate all of your actions here. These will appear in // Konqueror's menu and toolbars. - (void) new KAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0, + (void) new TDEAction( i18n("&Plugin Action"), "%{APPNAMELC}", 0, this, TQT_SLOT(slotAction()), actionCollection(), "plugin_action" ); } diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp index 2895fb0a..6b37401d 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.cpp +++ b/languages/cpp/app_templates/kscons_kxt/app.cpp @@ -26,14 +26,14 @@ #include <kstdaction.h> %{APPNAME}::%{APPNAME}() - : KMainWindow( 0, "%{APPNAME}" ), + : TDEMainWindow( 0, "%{APPNAME}" ), m_view(new %{APPNAME}View(this)), m_printer(0) { // accept dnd setAcceptDrops(true); - // tell the KMainWindow that this is indeed the main widget + // tell the TDEMainWindow that this is indeed the main widget setCentralWidget(m_view); // then, setup our actions @@ -76,7 +76,7 @@ void %{APPNAME}::setupActions() KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAME}View - KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, + TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h index 6ac2acb8..fd0e7fa1 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.h +++ b/languages/cpp/app_templates/kscons_kxt/app.h @@ -14,7 +14,7 @@ #include "%{APPNAMELC}view.h" class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; /** @@ -25,7 +25,7 @@ class KURL; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAME} : public KMainWindow, public DCOPObject +class %{APPNAME} : public TDEMainWindow, public DCOPObject { K_DCOP Q_OBJECT @@ -66,8 +66,8 @@ private: %{APPNAME}View *m_view; KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; }; #endif // _%{APPNAMEUC}_H_ diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp index 5ea5d069..87c66b54 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp @@ -77,7 +77,7 @@ void %{APPNAMELC}Part::setReadWrite(bool rw) void %{APPNAMELC}Part::setModified(bool modified) { // get a handle on our Save action and make sure it is valid - KAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); + TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); if (!save) return; diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp index 7ea17587..bc36931c 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp @@ -138,7 +138,7 @@ void %{APPNAMELC}tdemdi::setupActions() KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection()); KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); - KAction* action = KStdAction::configureToolbars(this, + TDEAction* action = KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection()); createGUI( NULL ); diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h index 02d26d0c..6819937d 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h +++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.h @@ -9,8 +9,8 @@ #include <tdemdimainfrm.h> #include <kurl.h> -class KToggleAction; -class KRecentFilesAction; +class TDEToggleAction; +class TDERecentFilesAction; class tdemdikonsole; class KMdiChildView; @@ -71,8 +71,8 @@ class %{APPNAMELC}tdemdi : public KMdiMainFrm TQValueList<%{APPNAMELC}tdemdiView*> m_views; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; KParts::PartManager *m_manager; diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp index 6f3e19fb..183841ad 100644 --- a/languages/cpp/app_templates/kxt/app.cpp +++ b/languages/cpp/app_templates/kxt/app.cpp @@ -25,14 +25,14 @@ #include <kstdaction.h> %{APPNAMELC}::%{APPNAMELC}() - : KMainWindow( 0, "%{APPNAMELC}" ), + : TDEMainWindow( 0, "%{APPNAMELC}" ), m_view(new %{APPNAMELC}View(this)), m_printer(0) { // accept dnd setAcceptDrops(true); - // tell the KMainWindow that this is indeed the main widget + // tell the TDEMainWindow that this is indeed the main widget setCentralWidget(m_view); // then, setup our actions @@ -71,7 +71,7 @@ void %{APPNAMELC}::setupActions() KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - the slot is in the class %{APPNAMELC}View - KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, + TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h index 76d48c70..b56f3ae9 100644 --- a/languages/cpp/app_templates/kxt/app.h +++ b/languages/cpp/app_templates/kxt/app.h @@ -13,7 +13,7 @@ #include "%{APPNAMELC}view.h" class KPrinter; -class KToggleAction; +class TDEToggleAction; class KURL; /** @@ -24,7 +24,7 @@ class KURL; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAMELC} : public KMainWindow +class %{APPNAMELC} : public TDEMainWindow { Q_OBJECT @@ -59,8 +59,8 @@ private: %{APPNAMELC}View *m_view; KPrinter *m_printer; - KToggleAction *m_toolbarAction; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_toolbarAction; + TDEToggleAction *m_statusbarAction; }; #endif // _%{APPNAMEUC}_H_ diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp index d158e45f..41e30220 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.cpp +++ b/languages/cpp/app_templates/tdeconfig35/app.cpp @@ -14,14 +14,14 @@ #include <kstatusbar.h> %{APPNAMELC}::%{APPNAMELC}() - : KMainWindow( 0, "%{APPNAMELC}" ), + : TDEMainWindow( 0, "%{APPNAMELC}" ), m_view(new %{APPNAMELC}View(this)), m_printer(0) { // accept dnd setAcceptDrops(true); - // tell the KMainWindow that this is indeed the main widget + // tell the TDEMainWindow that this is indeed the main widget setCentralWidget(m_view); // and a status bar statusBar()->show(); @@ -53,7 +53,7 @@ void %{APPNAMELC}::setupActions() KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection()); // custom menu and menu item - KAction *custom = new KAction(i18n("Swi&tch Colors"), 0, + TDEAction *custom = new TDEAction(i18n("Swi&tch Colors"), 0, m_view, TQT_SLOT(switchColors()), actionCollection(), "switch_action"); diff --git a/languages/cpp/app_templates/tdeconfig35/app.h b/languages/cpp/app_templates/tdeconfig35/app.h index c1aac7e4..67073ea3 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.h +++ b/languages/cpp/app_templates/tdeconfig35/app.h @@ -23,7 +23,7 @@ class KURL; * @author %{AUTHOR} <%{EMAIL}> * @version %{VERSION} */ -class %{APPNAMELC} : public KMainWindow +class %{APPNAMELC} : public TDEMainWindow { Q_OBJECT diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index aaad17c1..c6ee9db7 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -954,11 +954,11 @@ m_codeCompleteCh2Rx( "(->)|(\\:\\:)" ) { connect( part, TQT_SIGNAL( codeModelUpdated( const TQString& ) ), this, TQT_SLOT( slotCodeModelUpdated( const TQString& ) ) ); - KAction * action = new KAction( i18n("Jump to declaration under cursor"), 0, CTRL + Key_Comma, + TDEAction * action = new TDEAction( i18n("Jump to declaration under cursor"), 0, CTRL + Key_Comma, this, TQT_SLOT(slotJumpToDeclCursorContext()), part->actionCollection(), "jump_to_declaration_cursor_context" ); action->plug( &m_DummyActionWidget ); - action = new KAction( i18n("Jump to definition under cursor"), 0, CTRL + Key_Period, + action = new TDEAction( i18n("Jump to definition under cursor"), 0, CTRL + Key_Period, this, TQT_SLOT(slotJumpToDefCursorContext()), part->actionCollection(), "jump_to_defintion_cursor_context" ); action->plug( &m_DummyActionWidget ); } diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h index 48f73144..c0536c92 100644 --- a/languages/cpp/cppimplementationwidget.h +++ b/languages/cpp/cppimplementationwidget.h @@ -24,7 +24,7 @@ #include <codemodel.h> -class KListViewItem; +class TDEListViewItem; class CppSupportPart; class CppImplementationWidget : public ImplementationWidget diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index 75d6b918..ca2f082e 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -251,7 +251,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri connect( core(), TQT_SIGNAL( configWidget( KDialogBase* ) ), this, TQT_SLOT( configWidget( KDialogBase* ) ) ); - m_switchHeaderSourceAction = new KAction( i18n( "Switch Header/Implementation" ), SHIFT + Key_F12, + m_switchHeaderSourceAction = new TDEAction( i18n( "Switch Header/Implementation" ), SHIFT + Key_F12, this, TQT_SLOT( slotSwitchHeader() ), actionCollection(), "edit_switchheader" ); m_switchHeaderSourceAction->setToolTip( i18n( "Switch between header and implementation files" ) ); @@ -262,9 +262,9 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri "this brings you to the corresponding header file." ) ); m_switchHeaderSourceAction->setEnabled( false ); - KAction *action; + TDEAction *action; - action = new KAction( i18n( "Complete Text" ), CTRL + Key_Space, + action = new TDEAction( i18n( "Complete Text" ), CTRL + Key_Space, this, TQT_SLOT( slotCompleteText() ), actionCollection(), "edit_complete_text" ); action->setToolTip( i18n( "Complete current expression" ) ); @@ -273,11 +273,11 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri "for external libraries." ) ); action->setEnabled( false ); - m_createGetterSetterAction = new KAction( i18n( "Create Accessor Methods" ), 0, + m_createGetterSetterAction = new TDEAction( i18n( "Create Accessor Methods" ), 0, this, TQT_SLOT( slotCreateAccessMethods() ), actionCollection(), "edit_create_getter_setter" ); - action = new KAction( i18n( "Make Member" ), 0, Key_F2, + action = new TDEAction( i18n( "Make Member" ), 0, Key_F2, this, TQT_SLOT( slotMakeMember() ), actionCollection(), "edit_make_member" ); action->setToolTip( i18n( "Make member" ) ); @@ -285,7 +285,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri "based on the member declaration at the current line." ) ); action->plug( &m_DummyActionWidget ); - action = new KAction( i18n( "Navigation Menu" ), 0, CTRL + ALT + Key_Space, + action = new TDEAction( i18n( "Navigation Menu" ), 0, CTRL + ALT + Key_Space, this, TQT_SLOT( slotNavigate() ), actionCollection(), "edit_navigate" ); action->setToolTip( i18n( "Show the navigation-menu" ) ); @@ -293,7 +293,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri action->plug( &m_DummyActionWidget ); - action = new KAction( i18n( "New Class..." ), "classnew", 0, + action = new TDEAction( i18n( "New Class..." ), "classnew", 0, this, TQT_SLOT( slotNewClass() ), actionCollection(), "project_newclass" ); action->setToolTip( i18n( "Generate a new class" ) ); @@ -641,9 +641,9 @@ void CppSupportPart::slotNavigate() { unsigned int curLine = 0, curCol = 0; m_activeViewCursor->cursorPositionReal( &curLine, &curCol ); - if( m_navigationMenu ) delete (KPopupMenu*)m_navigationMenu; + if( m_navigationMenu ) delete (TDEPopupMenu*)m_navigationMenu; - m_navigationMenu = new KPopupMenu( m_activeView ); + m_navigationMenu = new TDEPopupMenu( m_activeView ); codeCompletion()->contextEvaluationMenus( m_navigationMenu, 0, curLine, curCol ); diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index b7ac8267..d858d274 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -85,11 +85,11 @@ class TQStringList; class TQListViewItem; class TranslationUnitAST; class TQTimer; -class KListView; +class TDEListView; class Driver; -class KPopupMenu; +class TDEPopupMenu; class BackgroundParserConfig; -class KAction; +class TDEAction; namespace KParts { @@ -414,8 +414,8 @@ private: CppSplitHeaderSourceConfig* m_pSplitHeaderSourceConfig; CreateGetterSetterConfiguration* m_pCreateGetterSetterConfiguration; - KAction * m_createGetterSetterAction; - KAction * m_switchHeaderSourceAction; + TDEAction * m_createGetterSetterAction; + TDEAction * m_switchHeaderSourceAction; QtBuildConfig* m_qtBuildConfig; @@ -455,7 +455,7 @@ private: FunctionDom m_activeFunction; VariableDom m_activeVariable; - TQGuardedPtr<KPopupMenu> m_navigationMenu; + TQGuardedPtr<TDEPopupMenu> m_navigationMenu; // TQTimer* m_functionHintTimer; // TQTimer* m_deleteParserStoreTimer; diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index afc910b8..21b3c55a 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -129,16 +129,16 @@ private: }; -class PCSListViewItem: public KListViewItem +class PCSListViewItem: public TDEListViewItem { public: PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* parent ) - : KListViewItem( parent ), m_importer( importer ) + : TDEListViewItem( parent ), m_importer( importer ) { init( ptr ); } PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* parent ) - : KListViewItem( parent ), m_importer( importer ) + : TDEListViewItem( parent ), m_importer( importer ) { init( ptr ); } diff --git a/languages/cpp/createpcsdialogbase.ui b/languages/cpp/createpcsdialogbase.ui index d75dde96..bb99e12a 100644 --- a/languages/cpp/createpcsdialogbase.ui +++ b/languages/cpp/createpcsdialogbase.ui @@ -26,7 +26,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string></string> diff --git a/languages/cpp/debugger/dbgpsdlg.cpp b/languages/cpp/debugger/dbgpsdlg.cpp index 8033a993..22104794 100644 --- a/languages/cpp/debugger/dbgpsdlg.cpp +++ b/languages/cpp/debugger/dbgpsdlg.cpp @@ -53,7 +53,7 @@ namespace GDBDebugger Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) : KDialog(parent, name, true), // modal psProc_(0), - pids_(new KListView(this)), + pids_(new TDEListView(this)), pidLines_(TQString()) { setCaption(i18n("Attach to Process")); @@ -67,7 +67,7 @@ Dbg_PS_Dialog::Dbg_PS_Dialog(TQWidget *parent, const char *name) TQBoxLayout *topLayout = new TQVBoxLayout(this, 5); - searchLineWidget_ = new KListViewSearchLineWidget(pids_, this); + searchLineWidget_ = new TDEListViewSearchLineWidget(pids_, this); topLayout->addWidget(searchLineWidget_); topLayout->addWidget(pids_); @@ -187,7 +187,7 @@ void Dbg_PS_Dialog::slotProcessExited() start = pos+1; } - // Need to set focus here too, as KListView will + // Need to set focus here too, as TDEListView will // 'steal' it otherwise. searchLineWidget_->searchLine()->setFocus(); } diff --git a/languages/cpp/debugger/dbgpsdlg.h b/languages/cpp/debugger/dbgpsdlg.h index 0bf445dc..f9dbbab0 100644 --- a/languages/cpp/debugger/dbgpsdlg.h +++ b/languages/cpp/debugger/dbgpsdlg.h @@ -20,8 +20,8 @@ class TQListBox; class TDEProcess; -class KListView; -class KListViewSearchLineWidget; +class TDEListView; +class TDEListViewSearchLineWidget; namespace GDBDebugger { @@ -49,8 +49,8 @@ protected: private: TDEProcess* psProc_; - KListView* pids_; - KListViewSearchLineWidget* searchLineWidget_; + TDEListView* pids_; + TDEListViewSearchLineWidget* searchLineWidget_; TQString pidLines_; TQString pidCmd_; }; diff --git a/languages/cpp/debugger/dbgtoolbar.cpp b/languages/cpp/debugger/dbgtoolbar.cpp index 8933ea12..16fe3b53 100644 --- a/languages/cpp/debugger/dbgtoolbar.cpp +++ b/languages/cpp/debugger/dbgtoolbar.cpp @@ -40,7 +40,7 @@ // Implements a floating toolbar for the debugger. -// Unfortunately, I couldn't get the KToolBar to work nicely when it +// Unfortunately, I couldn't get the TDEToolBar to work nicely when it // was floating, so I was forced to write these classes. I'm not sure whether // I didn't try hard enough or ... and I've forgotten what the problems were // now. @@ -48,7 +48,7 @@ // The problem with using this is that it will not dock as a normal toolbar. // I'm not convince that this is a real problem though. -// So, if you can get it to work as a KToolBar, and it works well when the +// So, if you can get it to work as a TDEToolBar, and it works well when the // app is running, then all these classes can be removed. // This code is very specific to the internal debugger in tdevelop. @@ -64,7 +64,7 @@ namespace GDBDebugger // I would have preferred to use normal decoration on the toolbar and removed // the iconify, close, etc buttons from the window title but again I kept running // into problems. Instead, I used no decoration and this class. Also this looks -// similar to the KToolBar floating style. +// similar to the TDEToolBar floating style. class DbgMoveHandle : public TQFrame { public: @@ -108,7 +108,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) return; if (e->button() == Qt::RightButton) { - KPopupMenu *menu = new KPopupMenu(this); + TDEPopupMenu *menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), parent(), TQT_SLOT(slotDock())); @@ -241,7 +241,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) } case Qt::RightButton: { - KPopupMenu* menu = new KPopupMenu(this); + TDEPopupMenu* menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Activate"), toolBar_, TQT_SLOT(slotUndock())); menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQT_SLOT(slotActivateAndUndock())); diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index c18d581d..29280d4e 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -183,10 +183,10 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi this, TQT_SLOT(slotShowView(bool))); // Now setup the actions - KAction *action; + TDEAction *action; -// action = new KAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, - action = new KAction(i18n("&Start"), "dbgrun", Key_F9, +// action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, + action = new TDEAction(i18n("&Start"), "dbgrun", Key_F9, this, TQT_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); @@ -197,7 +197,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "while it is running, in order to get information " "about variables, frame stack, and so on.") ); - action = new KAction(i18n("&Restart"), "dbgrestart", 0, + action = new TDEAction(i18n("&Restart"), "dbgrestart", 0, this, TQT_SLOT(slotRestart()), actionCollection(), "debug_restart"); action->setToolTip( i18n("Restart program") ); @@ -207,33 +207,33 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi action->setEnabled(false); - action = new KAction(i18n("Sto&p"), "stop", 0, + action = new TDEAction(i18n("Sto&p"), "stop", 0, this, TQT_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger.")); - action = new KAction(i18n("Interrupt"), "player_pause", 0, + action = new TDEAction(i18n("Interrupt"), "player_pause", 0, this, TQT_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current GDB command.")); - action = new KAction(i18n("Run to &Cursor"), "dbgrunto", 0, + action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0, this, TQT_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached.")); - action = new KAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0, + action = new TDEAction(i18n("Set E&xecution Position to Cursor"), "dbgjumpto", 0, this, TQT_SLOT(slotJumpToCursor()), actionCollection(), "debug_jumptocursor"); action->setToolTip( i18n("Jump to cursor") ); action->setWhatsThis(i18n("<b>Set Execution Position </b><p>Set the execution pointer to the current cursor position.")); - action = new KAction(i18n("Step &Over"), "dbgnext", Key_F10, + action = new TDEAction(i18n("Step &Over"), "dbgnext", Key_F10, this, TQT_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); @@ -244,14 +244,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "following the function call.") ); - action = new KAction(i18n("Step over Ins&truction"), "dbgnextinst", 0, + action = new TDEAction(i18n("Step over Ins&truction"), "dbgnextinst", 0, this, TQT_SLOT(slotStepOverInstruction()), actionCollection(), "debug_stepoverinst"); action->setToolTip( i18n("Step over instruction") ); action->setWhatsThis(i18n("<b>Step over instruction</b><p>Steps over the next assembly instruction.")); - action = new KAction(i18n("Step &Into"), "dbgstep", Key_F11, + action = new TDEAction(i18n("Step &Into"), "dbgstep", Key_F11, this, TQT_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); @@ -261,14 +261,14 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "the function has been entered.") ); - action = new KAction(i18n("Step into I&nstruction"), "dbgstepinst", 0, + action = new TDEAction(i18n("Step into I&nstruction"), "dbgstepinst", 0, this, TQT_SLOT(slotStepIntoInstruction()), actionCollection(), "debug_stepintoinst"); action->setToolTip( i18n("Step into instruction") ); action->setWhatsThis(i18n("<b>Step into instruction</b><p>Steps into the next assembly instruction.")); - action = new KAction(i18n("Step O&ut"), "dbgstepout", Key_F12, + action = new TDEAction(i18n("Step O&ut"), "dbgstepout", Key_F12, this, TQT_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current function") ); @@ -280,7 +280,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "main()) then this operation has no effect.") ); - action = new KAction(i18n("Viewers"), "dbgmemview", 0, + action = new TDEAction(i18n("Viewers"), "dbgmemview", 0, this, TQT_SLOT(slotMemoryView()), actionCollection(), "debug_memview"); action->setToolTip( i18n("Debugger viewers") ); @@ -291,7 +291,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "<b>Libraries</b>")); - action = new KAction(i18n("Examine Core File..."), "core", 0, + action = new TDEAction(i18n("Examine Core File..."), "core", 0, this, TQT_SLOT(slotExamineCore()), actionCollection(), "debug_core"); action->setToolTip( i18n("Examine core file") ); @@ -303,13 +303,13 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi "allowing you to do a post-mortem analysis.") ); - action = new KAction(i18n("Attach to Process"), "connect_creating", 0, + action = new TDEAction(i18n("Attach to Process"), "connect_creating", 0, this, TQT_SLOT(slotAttachProcess()), actionCollection(), "debug_attach"); action->setToolTip( i18n("Attach to process") ); action->setWhatsThis(i18n("<b>Attach to process</b><p>Attaches the debugger to a running process.")); - action = new KAction(i18n("Toggle Breakpoint"), 0, 0, + action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0, this, TQT_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); @@ -492,7 +492,7 @@ void DebuggerPart::contextMenu(TQPopupMenu *popup, const Context *context) if (running) { // Too bad we can't add TQAction to popup menu in TQt3. - KAction* act = actionCollection()->action("debug_runtocursor"); + TDEAction* act = actionCollection()->action("debug_runtocursor"); Q_ASSERT(act); if (act) { @@ -672,7 +672,7 @@ bool DebuggerPart::startDebugger() stateChanged( TQString("active") ); - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("&Continue") ); ac->action("debug_run")->setToolTip( @@ -737,7 +737,7 @@ void DebuggerPart::slotStopDebugger() mainWindow()->setViewAvailable(disassembleWidget, false); mainWindow()->setViewAvailable(gdbOutputWidget, false); - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("&Start") ); // ac->action("debug_run")->setIcon( "1rightarrow" ); ac->action("debug_run")->setToolTip( i18n("Runs the program in the debugger") ); @@ -912,7 +912,7 @@ void DebuggerPart::slotRun_part2() } else if (controller->stateIsOn( s_appNotStarted ) ) { - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("&Continue") ); ac->action("debug_run")->setToolTip( i18n("Continues the application execution") ); ac->action("debug_run")->setWhatsThis( i18n("Continue application execution\n\n" @@ -1135,7 +1135,7 @@ void DebuggerPart::slotStatus(const TQString &msg, int state) if (state & s_appNotStarted) { - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("To start something","Start") ); ac->action("debug_run")->setToolTip( i18n("Restart the program in the debugger") ); ac->action("debug_run")->setWhatsThis( i18n("Restart in debugger\n\n" @@ -1215,7 +1215,7 @@ void DebuggerPart::slotGotoSource(const TQString &fileName, int lineNum) void DebuggerPart::slotActivePartChanged( KParts::Part* part ) { - KAction* action = actionCollection()->action("debug_toggle_breakpoint"); + TDEAction* action = actionCollection()->action("debug_toggle_breakpoint"); if(!action) return; diff --git a/languages/cpp/debugger/gdboutputwidget.cpp b/languages/cpp/debugger/gdboutputwidget.cpp index 11e50feb..ef2dd56f 100644 --- a/languages/cpp/debugger/gdboutputwidget.cpp +++ b/languages/cpp/debugger/gdboutputwidget.cpp @@ -321,7 +321,7 @@ void GDBOutputWidget::restorePartialProjectSession(const TQDomElement* el) //void OutputText::contextMenuEvent(TQContextMenuEvent* e) TQPopupMenu* OutputText::createPopupMenu(const TQPoint&) { - KPopupMenu* popup = new KPopupMenu; + TDEPopupMenu* popup = new TDEPopupMenu; int id = popup->insertItem(i18n("Show Internal Commands"), this, diff --git a/languages/cpp/debugger/variablewidget.cpp b/languages/cpp/debugger/variablewidget.cpp index 62a99ad4..19dd877a 100644 --- a/languages/cpp/debugger/variablewidget.cpp +++ b/languages/cpp/debugger/variablewidget.cpp @@ -201,7 +201,7 @@ VariableTree::VariableTree(VariableWidget *parent, GDBController* controller, GDBBreakpointWidget* breakpointWidget, const char *name) - : KListView(parent, name), + : TDEListView(parent, name), TQToolTip( viewport() ), controller_(controller), breakpointWidget_(breakpointWidget), @@ -223,8 +223,8 @@ VariableTree::VariableTree(VariableWidget *parent, addColumn(i18n("Value")); // setResizeMode(AllColumns); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); connect( this, TQT_SIGNAL(itemRenamed( TQListViewItem*, int, const TQString&)), this, TQT_SLOT(slotItemRenamed( TQListViewItem*, int, const TQString&))); } @@ -237,7 +237,7 @@ VariableTree::~VariableTree() // ************************************************************************** -void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) +void VariableTree::slotContextMenu(TDEListView *, TQListViewItem *item) { if (!item) return; @@ -246,8 +246,8 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) if (item->parent()) { - KPopupMenu popup(this); - KPopupMenu format(this); + TDEPopupMenu popup(this); + TDEPopupMenu format(this); int idRemember = -2; int idRemove = -2; @@ -393,7 +393,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) } else if (item == recentExpressions_) { - KPopupMenu popup(this); + TDEPopupMenu popup(this); popup.insertTitle(i18n("Recent Expressions")); int idRemove = popup.insertItem( SmallIcon("editdelete"), i18n("Remove All")); @@ -1019,14 +1019,14 @@ void VariableTree::handleAddressComputed(const GDBMI::ResultRecord& r) // ************************************************************************** TrimmableItem::TrimmableItem(VariableTree *parent) - : KListViewItem (parent, parent->lastChild()) + : TDEListViewItem (parent, parent->lastChild()) { } // ************************************************************************** TrimmableItem::TrimmableItem(TrimmableItem *parent) - : KListViewItem (parent, parent->lastChild()) + : TDEListViewItem (parent, parent->lastChild()) { } diff --git a/languages/cpp/debugger/variablewidget.h b/languages/cpp/debugger/variablewidget.h index 86d08848..d08d5729 100644 --- a/languages/cpp/debugger/variablewidget.h +++ b/languages/cpp/debugger/variablewidget.h @@ -31,7 +31,7 @@ #include <vector> class KLineEdit; -class KPopupMenu; +class TDEPopupMenu; namespace GDBDebugger { @@ -83,7 +83,7 @@ private: /***************************************************************************/ /***************************************************************************/ -class VariableTree : public KListView, public TQToolTip +class VariableTree : public TDEListView, public TQToolTip { Q_OBJECT @@ -117,7 +117,7 @@ public slots: void slotItemRenamed(TQListViewItem* item, int col, const TQString& text); private slots: - void slotContextMenu(KListView *, TQListViewItem *item); + void slotContextMenu(TDEListView *, TQListViewItem *item); void slotVarobjNameChanged(const TQString& from, const TQString& to); private: // Callbacks for gdb commands; @@ -174,7 +174,7 @@ private: TQMap<TQString, VarItem*> varobj2varitem; - KPopupMenu* activePopup_; + TDEPopupMenu* activePopup_; static const int idToggleWatch = 10; friend class VarFrameRoot; @@ -204,7 +204,7 @@ private: 'trim' method is called, removing all variables which were not recieved from gdbr. */ -class TrimmableItem : public KListViewItem +class TrimmableItem : public TDEListViewItem { public: TrimmableItem(VariableTree *parent); diff --git a/languages/cpp/doc/kde2book.toc b/languages/cpp/doc/kde2book.toc index 6dd08e6c..d806e440 100644 --- a/languages/cpp/doc/kde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -250,7 +250,7 @@ <entry name="actions, helpContents" url="ch06.html"/> <entry name="actions, help" url="ch06.html"/> <entry name="actions, home" url="ch06.html"/> -<entry name="actions, KAction class" url="ch05.html"/> +<entry name="actions, TDEAction class" url="ch05.html"/> <entry name="actions, keyBindings" url="ch06.html"/> <entry name="actions, lastPage" url="ch06.html"/> <entry name="actions, mail" url="ch06.html"/> @@ -429,8 +429,8 @@ <entry name="classes, CGotoDialog, modeless dialog box" url="ch08lev1sec3.html"/> <entry name="classes, documentation" url="ch02lev1sec5.html"/> <entry name="classes, documentation" url="ch15.html"/> -<entry name="classes, KAction" url="ch05.html"/> -<entry name="classes, KAction" url="ch06.html"/> +<entry name="classes, TDEAction" url="ch05.html"/> +<entry name="classes, TDEAction" url="ch06.html"/> <entry name="classes, TDEApplication" url="ch02lev1sec3.html"/> <entry name="classes, KAudioPlayer" url="ch14lev1sec6.html"/> <entry name="classes, TDE versus Qt" url="ch03lev1sec2.html"/> @@ -775,7 +775,7 @@ <entry name="dialog boxes, modeless, removing from memory" url="ch08lev1sec3.html"/> <entry name="dialog boxes, simple example" url="ch08.html"/> <entry name="dialog boxes, standard dialog boxes, KFileDialog" url="ch05lev1sec3.html"/> -<entry name="dialog boxes, standard dialog boxes, KFontDialog" url="ch05lev1sec3.html"/> +<entry name="dialog boxes, standard dialog boxes, TDEFontDialog" url="ch05lev1sec3.html"/> <entry name="dialog boxes, standard dialog boxes, KMessageBox" url="ch05lev1sec3.html"/> <entry name="dialog boxes, standard dialog boxes, sample application" url="ch05lev1sec3.html"/> <entry name="dialog boxes, standard dialog boxes" url="ch05lev1sec3.html"/> @@ -830,7 +830,7 @@ <entry name="documentation, widgets" url="ch04.html"/> <entry name="document-centric programs" url="ch02lev1sec3.html"/> <entry name="document-centric user interface, actions, custom actions" url="ch05.html"/> -<entry name="document-centric user interface, actions, KAction class" url="ch05.html"/> +<entry name="document-centric user interface, actions, TDEAction class" url="ch05.html"/> <entry name="document-centric user interface, actions, standard actions" url="ch05.html"/> <entry name="document-centric user interface, actions" url="ch05.html"/> <entry name="document-centric user interface, content areas, Konqueror" url="ch05.html"/> @@ -993,7 +993,7 @@ <entry name="flushing graphics" url="ch03lev1sec2.html"/> <entry name="focusInEvent() event handler, widgets" url="ch04.html"/> <entry name="focusOutEvent() event handler, widgets" url="ch04.html"/> -<entry name="font dialog boxes, KFontDialog" url="ch05lev1sec3.html"/> +<entry name="font dialog boxes, TDEFontDialog" url="ch05lev1sec3.html"/> <entry name="font dialog boxes, KMessageBox" url="ch05lev1sec3.html"/> <entry name="formats, PNG, icons" url="ch06lev1sec3.html"/> <entry name="formatting tags (DocBook)" url="ch15lev1sec2.html"/> @@ -1153,7 +1153,7 @@ <entry name="GUIs, responsiveness" url="ch09.html"/> <entry name="GUIs, responsiveness, Window updates, double-buffering" url="ch09lev1sec2.html"/> <entry name="GUIs, standard dialog boxes, KFileDialog" url="ch05lev1sec3.html"/> -<entry name="GUIs, standard dialog boxes, KFontDialog" url="ch05lev1sec3.html"/> +<entry name="GUIs, standard dialog boxes, TDEFontDialog" url="ch05lev1sec3.html"/> <entry name="GUIs, standard dialog boxes, KMessageBox" url="ch05lev1sec3.html"/> <entry name="GUIs, standard dialog boxes, sample application" url="ch05lev1sec3.html"/> <entry name="GUIs, standard dialog boxes" url="ch05lev1sec3.html"/> @@ -1273,8 +1273,8 @@ <entry name="KabDemo application (address book dialog)" url="ch10lev1sec4.html"/> <entry name="kabdemo.cpp class definiiton (KabDemo)" url="ch10lev1sec4.html"/> <entry name="kabdemo.h class declaration (KabDemo)" url="ch10lev1sec4.html"/> -<entry name="KAction class" url="ch05.html"/> -<entry name="KAction class" url="ch06.html"/> +<entry name="TDEAction class" url="ch05.html"/> +<entry name="TDEAction class" url="ch06.html"/> <entry name="TDEApplication class" url="ch02lev1sec3.html"/> <entry name="KAudioPlayer class" url="ch14lev1sec6.html"/> <entry name="KButtonBox manager widget" url="ch08lev1sec4.html"/> @@ -1430,7 +1430,7 @@ <entry name="keywords, moc" url="ch03lev1sec4.html"/> <entry name="Keyword tag (DocBook)" url="ch15lev1sec2.html"/> <entry name="KFileDialog" url="ch05lev1sec3.html"/> -<entry name="KFontDialog" url="ch05lev1sec3.html"/> +<entry name="TDEFontDialog" url="ch05lev1sec3.html"/> <entry name="kfte editor" url="ch02.html"/> <entry name="kfte module (CVS)" url="ch17lev1sec2.html"/> <entry name="khello program, compiling" url="ch02lev1sec2.html"/> @@ -2544,7 +2544,7 @@ <entry name="standard actions, KStdActionsDemo widget, main() function" url="ch05.html"/> <entry name="standard actions, KStdActionsDemo widget" url="ch05.html"/> <entry name="standard dialog boxes, KFileDialog" url="ch05lev1sec3.html"/> -<entry name="standard dialog boxes, KFontDialog" url="ch05lev1sec3.html"/> +<entry name="standard dialog boxes, TDEFontDialog" url="ch05lev1sec3.html"/> <entry name="standard dialog boxes, KMessageBox" url="ch05lev1sec3.html"/> <entry name="standard dialog boxes, sample application" url="ch05lev1sec3.html"/> <entry name="standard dialog boxes" url="ch05lev1sec3.html"/> @@ -2680,7 +2680,7 @@ <entry name="UI compliance, help, ToolTips" url="ch05lev1sec2.html"/> <entry name="UI compliance, help" url="ch05lev1sec2.html"/> <entry name="UI compliance, standard dialog boxes, KFileDialog" url="ch05lev1sec3.html"/> -<entry name="UI compliance, standard dialog boxes, KFontDialog" url="ch05lev1sec3.html"/> +<entry name="UI compliance, standard dialog boxes, TDEFontDialog" url="ch05lev1sec3.html"/> <entry name="UI compliance, standard dialog boxes, KMessageBox" url="ch05lev1sec3.html"/> <entry name="UI compliance, standard dialog boxes, sample application" url="ch05lev1sec3.html"/> <entry name="UI compliance, standard dialog boxes" url="ch05lev1sec3.html"/> diff --git a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui index 3658c0ac..e529689d 100644 --- a/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qt4importer/settingsdialogbase.ui @@ -46,7 +46,7 @@ Only the selected entry will be used</string> <cstring>qtUrl</cstring> </property> </widget> - <widget class="KListBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>qtListBox</cstring> </property> diff --git a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui index 19fd0db1..82380038 100644 --- a/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/qtimporter/settingsdialogbase.ui @@ -105,7 +105,7 @@ Only the selected entry will be used</string> </property> </widget> - <widget class="KListBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>qtListBox</cstring> </property> diff --git a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui index 5e2604d3..acf72f22 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui +++ b/languages/cpp/pcsimporter/tdelibsimporter/settingsdialogbase.ui @@ -81,7 +81,7 @@ Only the selected entry will be used</string> <string>&Add</string> </property> </widget> - <widget class="KListBox" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TDEListBox" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>kdeListBox</cstring> </property> diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index baea54d7..349fc2ab 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -54,17 +54,17 @@ #include <tqlayout.h> #include <tqlineedit.h> -class ProblemItem: public KListViewItem +class ProblemItem: public TDEListViewItem { public: ProblemItem( TQListView* parent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, problem, file, line, column ) + : TDEListViewItem( parent, problem, file, line, column ) {} ProblemItem( TQListViewItem* parent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, problem, file, line, column ) + : TDEListViewItem( parent, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const @@ -77,7 +77,7 @@ public: return 0; return ( a > b ? 1 : -1 ); } - return KListViewItem::compare( item, column, ascending ); + return TDEListViewItem::compare( item, column, ascending ); } }; @@ -99,12 +99,12 @@ m_markIface( 0 ) connect( m_initCurrentTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(initCurrentList()) ); m_gridLayout = new TQGridLayout(this,2,3); - m_errorList = new KListView(this); - m_warningList = new KListView(this); - m_fixmeList = new KListView(this); - m_todoList = new KListView(this); - m_filteredList = new KListView(this); - m_currentList = new KListView(this); + m_errorList = new TDEListView(this); + m_warningList = new TDEListView(this); + m_fixmeList = new TDEListView(this); + m_todoList = new TDEListView(this); + m_filteredList = new TDEListView(this); + m_currentList = new TDEListView(this); m_filteredList->addColumn( i18n("Level") ); m_currentList->addColumn( i18n("Level") ); @@ -197,14 +197,14 @@ void ProblemReporter::configWidget( KDialogBase* dlg ) { } -void ProblemReporter::filterList(KListView* listview, const TQString& level) +void ProblemReporter::filterList(TDEListView* listview, const TQString& level) { TQListViewItemIterator it( listview ); while ( it.current() ) { if ( it.current()->text(3).contains(m_filterEdit->text(),false)) { - new KListViewItem(m_filteredList,level, + new TDEListViewItem(m_filteredList,level, it.current()->text(0), it.current()->text(1), it.current()->text(2), it.current()->text(3)); } @@ -217,7 +217,7 @@ void ProblemReporter::slotTabSelected( int tabindex ) m_widgetStack->raiseWidget(tabindex); } -void ProblemReporter::InitListView(KListView* listview) +void ProblemReporter::InitListView(TDEListView* listview) { listview->addColumn( i18n("File") ); listview->addColumn( i18n("Line") ); @@ -255,7 +255,7 @@ void ProblemReporter::slotActivePartChanged( KParts::Part* part ) initCurrentList(); } -void EfficientKListView::limitSize( int size ) +void EfficientTDEListView::limitSize( int size ) { if( m_map.size() <= size + 50 ) return; @@ -267,7 +267,7 @@ void EfficientKListView::limitSize( int size ) removeAllItems( (*it).str() ); } -void EfficientKListView::removeAllItems( const TQString& str ) +void EfficientTDEListView::removeAllItems( const TQString& str ) { HashedString h(str); m_insertionNumbers.erase( h ) ; @@ -326,9 +326,9 @@ void ProblemReporter::initCurrentList() // m_tabBar->setCurrentTab(0); } -void ProblemReporter::updateCurrentWith(EfficientKListView& listview, const TQString& level, const TQString& filename) +void ProblemReporter::updateCurrentWith(EfficientTDEListView& listview, const TQString& level, const TQString& filename) { - EfficientKListView::Range r = listview.getRange( filename ); + EfficientTDEListView::Range r = listview.getRange( filename ); for( ; r.first != r.second; ++r.first ) new ProblemItem(m_currentList,level,(*r.first).second->text(1),(*r.first).second->text(2),(*r.first).second->text(3)); } @@ -364,7 +364,7 @@ void ProblemReporter::reportProblem( const TQString& fileName, const Problem& p TQString relFileName = m_cppSupport->project()->relativeProjectFile(fileName); - EfficientKListView* list; + EfficientTDEListView* list; switch( p.level() ) { diff --git a/languages/cpp/problemreporter.h b/languages/cpp/problemreporter.h index 79a1b77f..2a8bf10a 100644 --- a/languages/cpp/problemreporter.h +++ b/languages/cpp/problemreporter.h @@ -36,31 +36,31 @@ class KDialogBase; class Problem; class KURL; -class EfficientKListView { +class EfficientTDEListView { public: typedef __gnu_cxx::hash_multimap<HashedString, TQListViewItem*> Map; typedef std::pair< Map::const_iterator, Map::const_iterator > Range; - EfficientKListView( KListView* list = 0 ) : m_list( list ), m_insertionNumber( 0 ) { + EfficientTDEListView( TDEListView* list = 0 ) : m_list( list ), m_insertionNumber( 0 ) { } - EfficientKListView& operator = ( KListView* list ) { + EfficientTDEListView& operator = ( TDEListView* list ) { m_list = list; return *this; } - operator KListView* () { + operator TDEListView* () { return m_list; } - operator const KListView* () const { + operator const TDEListView* () const { return m_list; } - KListView* operator -> () { + TDEListView* operator -> () { return m_list; } - const KListView* operator -> () const { + const TDEListView* operator -> () const { return m_list; } @@ -88,7 +88,7 @@ private: Map m_map; typedef __gnu_cxx::hash_map<HashedString, int> InsertionMap; InsertionMap m_insertionNumbers; //This is used to count which file was inserted first(higher insertion-number -> inserted later) - KListView* m_list; + TDEListView* m_list; }; namespace KParts @@ -128,21 +128,21 @@ private slots: private: TQString levelToString( int level ) const; int levelToMarkType( int level ) const; - void InitListView( KListView* listview ); - void filterList( KListView* listview, const TQString& level ); - void updateCurrentWith( EfficientKListView& listview, const TQString& level, const TQString& filename ); + void InitListView( TDEListView* listview ); + void filterList( TDEListView* listview, const TQString& level ); + void updateCurrentWith( EfficientTDEListView& listview, const TQString& level, const TQString& filename ); private: TQGridLayout* m_gridLayout; TQTabBar* m_tabBar; TQWidgetStack* m_widgetStack; - KListView* m_currentList; + TDEListView* m_currentList; TQTimer* m_initCurrentTimer; - EfficientKListView m_errorList; - EfficientKListView m_fixmeList; - EfficientKListView m_todoList; - EfficientKListView m_warningList; - KListView* m_filteredList; + EfficientTDEListView m_errorList; + EfficientTDEListView m_fixmeList; + EfficientTDEListView m_todoList; + EfficientTDEListView m_warningList; + TDEListView* m_filteredList; KLineEdit* m_filterEdit; CppSupportPart* m_cppSupport; diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index a852d419..43502e5d 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -60,29 +60,29 @@ CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const T connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); - KAction *action; + TDEAction *action; - action = new KAction( i18n("Execute Main Program"), "exec", 0, + action = new TDEAction( i18n("Execute Main Program"), "exec", 0, this, TQT_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Runs the CSharp program") ); - action = new KAction( i18n("Execute String..."), "exec", 0, + action = new TDEAction( i18n("Execute String..."), "exec", 0, this, TQT_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Executes a string as CSharp code") ); - action = new KAction( i18n("Start CSharp Interpreter"), "exec", 0, + action = new TDEAction( i18n("Start CSharp Interpreter"), "exec", 0, this, TQT_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Starts the CSharp interpreter without a program") ); - action = new KAction( i18n("Find CSharp Function Documentation..."), 0, + action = new TDEAction( i18n("Find CSharp Function Documentation..."), 0, this, TQT_SLOT(slotCSharpdocFunction()), actionCollection(), "help_csharpdocfunction" ); action->setToolTip( i18n("Show the documentation page of a CSharp function") ); - action = new KAction( i18n("Find CSharp FAQ Entry..."), 0, + action = new TDEAction( i18n("Find CSharp FAQ Entry..."), 0, this, TQT_SLOT(slotCSharpdocFAQ()), actionCollection(), "help_csharpdocfaq" ); action->setToolTip( i18n("Show the FAQ entry for a keyword") ); diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index 4eeae482..71f9262e 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -62,9 +62,9 @@ FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); - KAction *action; + TDEAction *action; - action = new KAction( i18n("&Ftnchek"), 0, + action = new TDEAction( i18n("&Ftnchek"), 0, this, TQT_SLOT(slotFtnchek()), actionCollection(), "project_ftnchek" ); action->setToolTip(i18n("Run ftnchek")); diff --git a/languages/java/app_templates/kappjava/app.java b/languages/java/app_templates/kappjava/app.java index d6424f73..40bc6b93 100644 --- a/languages/java/app_templates/kappjava/app.java +++ b/languages/java/app_templates/kappjava/app.java @@ -14,7 +14,7 @@ import org.kde.koala.*; * @author $AUTHOR <$EMAIL> * @version $APP_VERSION */ -public class %{APPNAME} extends KMainWindow +public class %{APPNAME} extends TDEMainWindow { private %{APPNAME}View m_view; private QPrinter m_printer; @@ -27,7 +27,7 @@ public class %{APPNAME} extends KMainWindow // accept dnd setAcceptDrops(true); - // tell the KMainWindow that this is indeed the main widget + // tell the TDEMainWindow that this is indeed the main widget setCentralWidget(m_view); // then, setup our actions @@ -88,7 +88,7 @@ public void setupActions() // this doesn't do anything useful. it's just here to illustrate // how to insert a custom menu and menu item - KAction custom = new KAction(tr("Cus&tom Menuitem"), new KShortcut(), + TDEAction custom = new TDEAction(tr("Cus&tom Menuitem"), new TDEShortcut(), this, SLOT("optionsPreferences()"), actionCollection(), "custom_action"); } diff --git a/languages/java/configproblemreporter.ui b/languages/java/configproblemreporter.ui index a4852fd5..a0e1ca39 100644 --- a/languages/java/configproblemreporter.ui +++ b/languages/java/configproblemreporter.ui @@ -103,7 +103,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView" row="0" column="0" rowspan="5" colspan="1"> + <widget class="TDEListView" row="0" column="0" rowspan="5" colspan="1"> <column> <property name="text"> <string></string> diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 23ae1cc7..c868afa5 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -155,9 +155,9 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(configWidget(KDialogBase*)) ); - KAction *action; + TDEAction *action; - action = new KAction(i18n("New Class..."), "classnew", 0, + action = new TDEAction(i18n("New Class..."), "classnew", 0, this, TQT_SLOT(slotNewClass()), actionCollection(), "project_newclass"); action->setToolTip( i18n("Generate a new class") ); diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h index 54e1d57f..b71ca95c 100644 --- a/languages/java/javasupportpart.h +++ b/languages/java/javasupportpart.h @@ -33,7 +33,7 @@ class TQLabel; class TQProgressBar; class TQStringList; class TQListViewItem; -class KListView; +class TDEListView; class Driver; namespace KParts { class Part; } diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index a451abf3..4570efc7 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -51,16 +51,16 @@ #include <tqgroupbox.h> -class ProblemItem: public KListViewItem +class ProblemItem: public TDEListViewItem { public: ProblemItem( TQListView* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, level, problem, file, line, column ) {} + : TDEListViewItem( parent, level, problem, file, line, column ) {} ProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, level, problem, file, line, column ) {} + : TDEListViewItem( parent, level, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 2 || column == 3 ){ @@ -70,13 +70,13 @@ public: return 0; return( a > b ? 1 : -1 ); } - return KListViewItem::compare( item, column, ascending ); + return TDEListViewItem::compare( item, column, ascending ); } }; ProblemReporter::ProblemReporter( JavaSupportPart* part, TQWidget* parent, const char* name ) - : KListView( parent, name ? name : "problemreporter" ), + : TDEListView( parent, name ? name : "problemreporter" ), m_javaSupport( part ), m_document( 0 ), m_markIface( 0 ) diff --git a/languages/java/problemreporter.h b/languages/java/problemreporter.h index 42c26d9f..dace638b 100644 --- a/languages/java/problemreporter.h +++ b/languages/java/problemreporter.h @@ -36,7 +36,7 @@ namespace KTextEditor{ class Document; } -class ProblemReporter: public KListView{ +class ProblemReporter: public TDEListView{ Q_OBJECT public: diff --git a/languages/kjssupport/kjsproblems.cpp b/languages/kjssupport/kjsproblems.cpp index 31882e7c..1a13870e 100644 --- a/languages/kjssupport/kjsproblems.cpp +++ b/languages/kjssupport/kjsproblems.cpp @@ -20,17 +20,17 @@ #include "kjssupport_part.h" #include <kiconloader.h> -class KJSProblemItem: public KListViewItem +class KJSProblemItem: public TDEListViewItem { public: KJSProblemItem( TQListView* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, level, problem, file, line, column ) + : TDEListViewItem( parent, level, problem, file, line, column ) {} KJSProblemItem( TQListViewItem* parent, const TQString& level, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, level, problem, file, line, column ) + : TDEListViewItem( parent, level, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const @@ -43,12 +43,12 @@ class KJSProblemItem: public KListViewItem return 0; return( a > b ? 1 : -1 ); } - return KListViewItem::compare( item, column, ascending ); + return TDEListViewItem::compare( item, column, ascending ); } }; -KJSProblems::KJSProblems(kjsSupportPart *part, TQWidget *parent, const char *name) : KListView(parent,name), m_part(part) +KJSProblems::KJSProblems(kjsSupportPart *part, TQWidget *parent, const char *name) : TDEListView(parent,name), m_part(part) { addColumn ("File"); addColumn ("Line #"); diff --git a/languages/kjssupport/kjsproblems.h b/languages/kjssupport/kjsproblems.h index 473624ae..beb1fd5d 100644 --- a/languages/kjssupport/kjsproblems.h +++ b/languages/kjssupport/kjsproblems.h @@ -25,7 +25,7 @@ class kjsSupportPart; /** @author ian reinhart geiser */ -class KJSProblems : public KListView +class KJSProblems : public TDEListView { Q_OBJECT diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index c73d51bb..100f34e6 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -69,7 +69,7 @@ kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStrin setXMLFile("kdevkjssupport.rc"); - m_build = new KAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); + m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); m_build->setStatusText( i18n("Test the active script.") ); kdDebug() << "Creating kjssupport Part" << endl; diff --git a/languages/kjssupport/kjssupport_part.h b/languages/kjssupport/kjssupport_part.h index 1a1eae10..4572b9a2 100644 --- a/languages/kjssupport/kjssupport_part.h +++ b/languages/kjssupport/kjssupport_part.h @@ -35,7 +35,7 @@ class KJSConsoleWidget; }; class TQPopupMenu; -class KAction; +class TDEAction; class KJSProblems; class JSCodeCompletion; class Context; @@ -73,7 +73,7 @@ class kjsSupportPart : public KDevLanguageSupport void addAttribute(const TQString &name, FileDom file, uint lineNo); void addMethod(const TQString &name, FileDom file, uint lineNo); ClassDom addClass(const TQString &name, FileDom file, uint lineNo); - KAction *m_build; + TDEAction *m_build; KJSEmbed::KJSEmbedPart *m_js; KJSProblems *m_problemReporter; TQDict<typeProperty> m_typeMap; diff --git a/languages/kjssupport/template/app.js b/languages/kjssupport/template/app.js index aa564dd6..f15d3bfa 100644 --- a/languages/kjssupport/template/app.js +++ b/languages/kjssupport/template/app.js @@ -1,8 +1,8 @@ #!/usr/bin/env kjscmd // Create main view -var mw = new KMainWindow(); -var lv = new KListView( mw ); +var mw = new TDEMainWindow(); +var lv = new TDEListView( mw ); mw.setCentralWidget(lv); lv.addColumn('One'); diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp index c051db92..b9e193a1 100644 --- a/languages/lib/designer_integration/implementationwidget.cpp +++ b/languages/lib/designer_integration/implementationwidget.cpp @@ -38,23 +38,23 @@ #include <kdevlanguagesupport.h> namespace ImplUtils{ -class ClassItem: public KListViewItem{ +class ClassItem: public TDEListViewItem{ public: - ClassItem(KListViewItem *parent, ClassDom dom) - :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } - ClassItem(KListView *parent, ClassDom dom) - :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } + ClassItem(TDEListViewItem *parent, ClassDom dom) + :TDEListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } + ClassItem(TDEListView *parent, ClassDom dom) + :TDEListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } ClassDom dom() const { return m_dom; } private: ClassDom m_dom; }; -class NamespaceItem: public KListViewItem{ +class NamespaceItem: public TDEListViewItem{ public: - NamespaceItem(KListViewItem *parent, NamespaceDom dom) - :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } - NamespaceItem(KListView *parent, NamespaceDom dom) - :KListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } + NamespaceItem(TDEListViewItem *parent, NamespaceDom dom) + :TDEListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } + NamespaceItem(TDEListView *parent, NamespaceDom dom) + :TDEListViewItem(parent, dom->name(), dom->fileName()), m_dom(dom) { setOpen(true); } NamespaceDom dom() const { return m_dom; } private: NamespaceDom m_dom; @@ -79,12 +79,12 @@ void ImplementationWidget::init(const TQString &formName) m_baseClassName = DomUtil::elementByPathExt(doc, "class").text(); setCaption(i18n("Create or Select Implementation Class for: %1").arg(m_baseClassName)); - KListViewItem *item = new KListViewItem(classView, i18n("Namespaces && Classes")); + TDEListViewItem *item = new TDEListViewItem(classView, i18n("Namespaces && Classes")); item->setOpen(true); processNamespaces(m_part->codeModel()->globalNamespace(), item); } -void ImplementationWidget::processNamespaces(NamespaceDom dom, KListViewItem *parent) +void ImplementationWidget::processNamespaces(NamespaceDom dom, TDEListViewItem *parent) { const NamespaceList nslist = dom->namespaceList(); for (NamespaceList::const_iterator it = nslist.begin(); it != nslist.end(); ++it) @@ -94,7 +94,7 @@ void ImplementationWidget::processNamespaces(NamespaceDom dom, KListViewItem *pa processClasses(*it, new ImplUtils::ClassItem(parent, *it)); } -void ImplementationWidget::processClasses(ClassDom dom, KListViewItem *parent) +void ImplementationWidget::processClasses(ClassDom dom, TDEListViewItem *parent) { const ClassList cllist = dom->classList(); for (ClassList::ConstIterator it = cllist.begin(); it != cllist.end(); ++it) diff --git a/languages/lib/designer_integration/implementationwidget.h b/languages/lib/designer_integration/implementationwidget.h index bae6cdff..dcdd820c 100644 --- a/languages/lib/designer_integration/implementationwidget.h +++ b/languages/lib/designer_integration/implementationwidget.h @@ -25,7 +25,7 @@ #include <codemodel.h> -class KListViewItem; +class TDEListViewItem; class KDevLanguageSupport; /** @@ -61,8 +61,8 @@ protected: the number of classes being displayed as possible implementation classes.*/ void init(const TQString &formName); - void processNamespaces(NamespaceDom dom, KListViewItem *parent); - void processClasses(ClassDom dom, KListViewItem *parent); + void processNamespaces(NamespaceDom dom, TDEListViewItem *parent); + void processClasses(ClassDom dom, TDEListViewItem *parent); /**Creates a class and adds it to a project. No need to reimplement.*/ bool createClass(); diff --git a/languages/lib/designer_integration/implementationwidgetbase.ui b/languages/lib/designer_integration/implementationwidgetbase.ui index 93969da3..8dc6c545 100644 --- a/languages/lib/designer_integration/implementationwidgetbase.ui +++ b/languages/lib/designer_integration/implementationwidgetbase.ui @@ -103,7 +103,7 @@ <bool>true</bool> </property> </widget> - <widget class="KListView" row="4" column="0"> + <widget class="TDEListView" row="4" column="0"> <column> <property name="text"> <string>Class Name</string> diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index e634b52c..c3d92608 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -60,29 +60,29 @@ PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStr connect( partController(), TQT_SIGNAL(savedFile(const KURL&)), this, TQT_SLOT(savedFile(const KURL&)) ); - KAction *action; + TDEAction *action; - action = new KAction( i18n("Execute Main Program"), "exec", 0, + action = new TDEAction( i18n("Execute Main Program"), "exec", 0, this, TQT_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Runs the Perl program") ); - action = new KAction( i18n("Execute String..."), "exec", 0, + action = new TDEAction( i18n("Execute String..."), "exec", 0, this, TQT_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Executes a string as Perl code") ); - action = new KAction( i18n("Start Perl Interpreter"), "exec", 0, + action = new TDEAction( i18n("Start Perl Interpreter"), "exec", 0, this, TQT_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Starts the Perl interpreter without a program") ); - action = new KAction( i18n("Find Perl Function Documentation..."), 0, + action = new TDEAction( i18n("Find Perl Function Documentation..."), 0, this, TQT_SLOT(slotPerldocFunction()), actionCollection(), "help_perldocfunction" ); action->setToolTip( i18n("Show the documentation page of a Perl function") ); - action = new KAction( i18n("Find Perl FAQ Entry..."), 0, + action = new TDEAction( i18n("Find Perl FAQ Entry..."), 0, this, TQT_SLOT(slotPerldocFAQ()), actionCollection(), "help_perldocfaq" ); action->setToolTip( i18n("Show the FAQ entry for a keyword") ); diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index d3134a89..0703ff3c 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -53,16 +53,16 @@ #include <tqlayout.h> #include <tqlineedit.h> -class ProblemItem: public KListViewItem +class ProblemItem: public TDEListViewItem { public: ProblemItem( TQListView* parent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, problem, file, line, column ) {} + : TDEListViewItem( parent, problem, file, line, column ) {} ProblemItem( TQListViewItem* parent, const TQString& problem, const TQString& file, const TQString& line, const TQString& column ) - : KListViewItem( parent, problem, file, line, column ) {} + : TDEListViewItem( parent, problem, file, line, column ) {} int compare( TQListViewItem* item, int column, bool ascending ) const { if( column == 2 || column == 3 ){ @@ -72,7 +72,7 @@ public: return 0; return( a > b ? 1 : -1 ); } - return KListViewItem::compare( item, column, ascending ); + return TDEListViewItem::compare( item, column, ascending ); } }; @@ -92,11 +92,11 @@ PHPErrorView::PHPErrorView( PHPSupportPart* part, TQWidget* parent, const char* m_gridLayout = new TQGridLayout(this,2,3); - m_errorList = new KListView(this); - m_fixmeList = new KListView(this); - m_todoList = new KListView(this); - m_filteredList = new KListView(this); - m_currentList = new KListView(this); + m_errorList = new TDEListView(this); + m_fixmeList = new TDEListView(this); + m_todoList = new TDEListView(this); + m_filteredList = new TDEListView(this); + m_currentList = new TDEListView(this); m_filteredList->addColumn( i18n("Level") ); m_currentList->addColumn( i18n("Level") ); @@ -162,12 +162,12 @@ void PHPErrorView::slotFilter() } -void PHPErrorView::filterList(KListView* listview, const TQString& level) +void PHPErrorView::filterList(TDEListView* listview, const TQString& level) { TQListViewItemIterator it( listview ); while ( it.current() ) { if ( it.current()->text(3).contains(m_filterEdit->text(),false)) - new KListViewItem(m_filteredList,level, + new TDEListViewItem(m_filteredList,level, it.current()->text(0),it.current()->text(1),it.current()->text(2),it.current()->text(3)); ++it; } @@ -178,7 +178,7 @@ void PHPErrorView::slotTabSelected( int tabindex ) m_widgetStack->raiseWidget(tabindex); } -void PHPErrorView::InitListView(KListView* listview) +void PHPErrorView::InitListView(TDEListView* listview) { listview->addColumn( i18n("File") ); listview->addColumn( i18n("Line") ); @@ -313,7 +313,7 @@ void PHPErrorView::reportProblem( int level, const TQString& fileName, int line, TQString relFileName = fileName; relFileName.remove(m_phpSupport->project()->projectDirectory()); - KListView* list; + TDEListView* list; switch( level ) { case Error: diff --git a/languages/php/phperrorview.h b/languages/php/phperrorview.h index 20eeb859..a14c0c8e 100644 --- a/languages/php/phperrorview.h +++ b/languages/php/phperrorview.h @@ -75,9 +75,9 @@ private slots: private: TQString levelToString( int level ) const; int levelToMarkType( int level ) const; - void InitListView(KListView* listview); + void InitListView(TDEListView* listview); void removeAllItems( TQListView* listview, const TQString& filename ); - void filterList(KListView* listview, const TQString& level); + void filterList(TDEListView* listview, const TQString& level); void updateCurrentWith(TQListView* listview, const TQString& level, const TQString& filename); void initCurrentList(); @@ -85,12 +85,12 @@ private: TQGridLayout* m_gridLayout; TQTabBar* m_tabBar; TQWidgetStack* m_widgetStack; - KListView* m_currentList; - KListView* m_errorList; - KListView* m_fixmeList; - KListView* m_warningList; - KListView* m_todoList; - KListView* m_filteredList; + TDEListView* m_currentList; + TDEListView* m_errorList; + TDEListView* m_fixmeList; + TDEListView* m_warningList; + TDEListView* m_todoList; + TDEListView* m_filteredList; KLineEdit* m_filterEdit; PHPSupportPart* m_phpSupport; diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index 5d42b59e..e7a597de 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -86,15 +86,15 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - KAction *action; + TDEAction *action; - action = new KAction( i18n("&Run"), "exec",Key_F9, + action = new TDEAction( i18n("&Run"), "exec",Key_F9, this, TQT_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Executes script on a terminal or a webserver.")); - action = new KAction( i18n("&New Class..."),0, + action = new TDEAction( i18n("&New Class..."),0, this, TQT_SLOT(slotNewClass()), actionCollection(), "project_new_class" ); action->setToolTip(i18n("New class")); @@ -125,7 +125,7 @@ PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStrin m_codeCompletion = new PHPCodeCompletion(this, configData); - new KAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQT_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text"); + new TDEAction(i18n("Complete Text"), CTRL+Key_Space, m_codeCompletion, TQT_SLOT(cursorPositionChanged()), actionCollection(), "edit_complete_text"); connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part *))); diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index e82cfefc..d921108a 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -58,27 +58,27 @@ PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const T connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - KAction *action; + TDEAction *action; - action = new KAction( i18n("Execute Program"), "exec", 0, + action = new TDEAction( i18n("Execute Program"), "exec", 0, this, TQT_SLOT(slotExecute()), actionCollection(), "build_exec" ); action->setToolTip( i18n("Execute program") ); action->setWhatsThis(i18n("<b>Execute program</b><p>Runs the Python program.")); - action = new KAction( i18n("Execute String..."), "exec", 0, + action = new TDEAction( i18n("Execute String..."), "exec", 0, this, TQT_SLOT(slotExecuteString()), actionCollection(), "build_execstring" ); action->setToolTip( i18n("Execute string") ); action->setWhatsThis(i18n("<b>Execute String</b><p>Executes a string as Python code.")); - action = new KAction( i18n("Start Python Interpreter"), "exec", 0, + action = new TDEAction( i18n("Start Python Interpreter"), "exec", 0, this, TQT_SLOT(slotStartInterpreter()), actionCollection(), "build_runinterpreter" ); action->setToolTip( i18n("Start Python interpreter") ); action->setWhatsThis(i18n("<b>Start python interpreter</b><p>Starts the Python interpreter without a program")); - action = new KAction( i18n("Python Documentation..."), 0, + action = new TDEAction( i18n("Python Documentation..."), 0, this, TQT_SLOT(slotPydoc()), actionCollection(), "help_pydoc" ); action->setToolTip( i18n("Python documentation") ); diff --git a/languages/ruby/debugger/dbgtoolbar.cpp b/languages/ruby/debugger/dbgtoolbar.cpp index c985fabb..7bfb4ad9 100644 --- a/languages/ruby/debugger/dbgtoolbar.cpp +++ b/languages/ruby/debugger/dbgtoolbar.cpp @@ -46,7 +46,7 @@ // Implements a floating toolbar for the debugger. -// Unfortunately, I couldn't get the KToolBar to work nicely when it +// Unfortunately, I couldn't get the TDEToolBar to work nicely when it // was floating, so I was forced to write these classes. I'm not sure whether // I didn't try hard enough or ... and I've forgotten what the problems were // now. @@ -54,7 +54,7 @@ // The problem with using this is that it will not dock as a normal toolbar. // I'm not convince that this is a real problem though. -// So, if you can get it to work as a KToolBar, and it works well when the +// So, if you can get it to work as a TDEToolBar, and it works well when the // app is running, then all these classes can be removed. // This code is very specific to the internal debugger in tdevelop. @@ -70,7 +70,7 @@ namespace RDBDebugger // I would have preferred to use normal decoration on the toolbar and removed // the iconify, close, etc buttons from the window title but again I kept running // into problems. Instead, I used no decoration and this class. Also this looks -// similar to the KToolBar floating style. +// similar to the TDEToolBar floating style. class DbgMoveHandle : public TQFrame { public: @@ -114,7 +114,7 @@ void DbgMoveHandle::mousePressEvent(TQMouseEvent *e) return; if (e->button() == Qt::RightButton) { - KPopupMenu *menu = new KPopupMenu(this); + TDEPopupMenu *menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Dock to Panel"), parent(), TQT_SLOT(slotDock())); @@ -240,7 +240,7 @@ void DbgDocker::mousePressEvent(TQMouseEvent *e) } case Qt::RightButton: { - KPopupMenu* menu = new KPopupMenu(this); + TDEPopupMenu* menu = new TDEPopupMenu(this); menu->insertTitle(i18n("Debug Toolbar")); menu->insertItem(i18n("Activate"), toolBar_, TQT_SLOT(slotUndock())); menu->insertItem(i18n("Activate (TDevelop gets focus)"), toolBar_, TQT_SLOT(slotActivateAndUndock())); diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index 3daefeff..70611d28 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -156,10 +156,10 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ this, TQT_SLOT(slotGotoSource(const TQString&, int)) ); // Now setup the actions - KAction *action; + TDEAction *action; -// action = new KAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, - action = new KAction(i18n("&Start"), "dbgrun", CTRL+SHIFT+Key_F9, +// action = new TDEAction(i18n("&Start"), "1rightarrow", CTRL+SHIFT+Key_F9, + action = new TDEAction(i18n("&Start"), "dbgrun", CTRL+SHIFT+Key_F9, this, TQT_SLOT(slotRun()), actionCollection(), "debug_run"); action->setToolTip( i18n("Start in debugger") ); @@ -170,26 +170,26 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ "while it is running, in order to get information " "about variables, frame stack, and so on.") ); - action = new KAction(i18n("Sto&p"), "stop", 0, + action = new TDEAction(i18n("Sto&p"), "stop", 0, this, TQT_SLOT(slotStop()), actionCollection(), "debug_stop"); action->setToolTip( i18n("Stop debugger") ); action->setWhatsThis(i18n("<b>Stop debugger</b><p>Kills the executable and exits the debugger.")); - action = new KAction(i18n("Interrupt"), "player_pause", 0, + action = new TDEAction(i18n("Interrupt"), "player_pause", 0, this, TQT_SLOT(slotPause()), actionCollection(), "debug_pause"); action->setToolTip( i18n("Interrupt application") ); action->setWhatsThis(i18n("<b>Interrupt application</b><p>Interrupts the debugged process or current RDB command.")); - action = new KAction(i18n("Run to &Cursor"), "dbgrunto", 0, + action = new TDEAction(i18n("Run to &Cursor"), "dbgrunto", 0, this, TQT_SLOT(slotRunToCursor()), actionCollection(), "debug_runtocursor"); action->setToolTip( i18n("Run to cursor") ); action->setWhatsThis(i18n("<b>Run to cursor</b><p>Continues execution until the cursor position is reached.")); - action = new KAction(i18n("Step &Over"), "dbgnext", 0, + action = new TDEAction(i18n("Step &Over"), "dbgnext", 0, this, TQT_SLOT(slotStepOver()), actionCollection(), "debug_stepover"); action->setToolTip( i18n("Step over the next line") ); @@ -200,7 +200,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ "following the method call.") ); - action = new KAction(i18n("Step &Into"), "dbgstep", 0, + action = new TDEAction(i18n("Step &Into"), "dbgstep", 0, this, TQT_SLOT(slotStepInto()), actionCollection(), "debug_stepinto"); action->setToolTip( i18n("Step into the next statement") ); @@ -211,7 +211,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ - action = new KAction(i18n("Step O&ut"), "dbgstepout", 0, + action = new TDEAction(i18n("Step O&ut"), "dbgstepout", 0, this, TQT_SLOT(slotStepOut()), actionCollection(), "debug_stepout"); action->setToolTip( i18n("Steps out of the current method") ); @@ -223,7 +223,7 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ "the topleveltoggleWatchpoint) then this operation has no effect.") ); - action = new KAction(i18n("Toggle Breakpoint"), 0, 0, + action = new TDEAction(i18n("Toggle Breakpoint"), 0, 0, this, TQT_SLOT(toggleBreakpoint()), actionCollection(), "debug_toggle_breakpoint"); action->setToolTip(i18n("Toggle breakpoint")); @@ -488,7 +488,7 @@ bool RubyDebuggerPart::startDebugger() stateChanged( TQString("active") ); - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("&Continue") ); // ac->action("debug_run")->setIcon( "dbgrun" ); ac->action("debug_run")->setToolTip( i18n("Continues the application execution") ); @@ -566,7 +566,7 @@ void RubyDebuggerPart::slotStopDebugger() mainWindow()->setViewAvailable(framestackWidget, false); mainWindow()->setViewAvailable(rdbOutputWidget, false); - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("&Start") ); // ac->action("debug_run")->setIcon( "1rightarrow" ); ac->action("debug_run")->setToolTip( i18n("Runs the program in the debugger") ); @@ -599,7 +599,7 @@ void RubyDebuggerPart::slotRun() appFrontend()->clearView(); startDebugger(); } else { - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("&Continue") ); ac->action("debug_run")->setToolTip( i18n("Continues the application execution") ); ac->action("debug_run")->setWhatsThis( i18n("Continue application execution\n\n" @@ -701,7 +701,7 @@ void RubyDebuggerPart::slotStatus(const TQString &msg, int state) { stateIndicator = "E"; stateChanged( TQString("stopped") ); - KActionCollection *ac = actionCollection(); + TDEActionCollection *ac = actionCollection(); ac->action("debug_run")->setText( i18n("Restart") ); // ac->action("debug_run")->setIcon( "1rightarrow" ); ac->action("debug_run")->setToolTip( i18n("Restart the program in the debugger") ); @@ -744,7 +744,7 @@ void RubyDebuggerPart::slotGotoSource(const TQString &fileName, int lineNum) void RubyDebuggerPart::slotActivePartChanged( KParts::Part* part ) { - KAction* action = actionCollection()->action("debug_toggle_breakpoint"); + TDEAction* action = actionCollection()->action("debug_toggle_breakpoint"); if(!action) return; diff --git a/languages/ruby/debugger/variablewidget.cpp b/languages/ruby/debugger/variablewidget.cpp index de60eaea..8179eeab 100644 --- a/languages/ruby/debugger/variablewidget.cpp +++ b/languages/ruby/debugger/variablewidget.cpp @@ -128,7 +128,7 @@ void VariableWidget::savePartialProjectSession(TQDomElement* el) // ************************************************************************** VariableTree::VariableTree(VariableWidget *parent, const char *name) - : KListView(parent, name), + : TDEListView(parent, name), TQToolTip( viewport() ), activationId_(0), currentThread_(-1), @@ -145,8 +145,8 @@ VariableTree::VariableTree(VariableWidget *parent, const char *name) addColumn(i18n("Variable"), 100 ); addColumn(i18n("Value"), 100 ); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*)) ); connect( this, TQT_SIGNAL(pressed(TQListViewItem*)), this, TQT_SLOT(slotPressed(TQListViewItem*)) ); @@ -180,7 +180,7 @@ void VariableTree::clear() // ************************************************************************** -void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) +void VariableTree::slotContextMenu(TDEListView *, TQListViewItem *item) { if (item == 0) return; @@ -188,7 +188,7 @@ void VariableTree::slotContextMenu(KListView *, TQListViewItem *item) setSelected(item, true); // Need to select this item. if (item->parent() != 0) { - KPopupMenu popup(this); + TDEPopupMenu popup(this); popup.insertTitle(item->text(VAR_NAME_COLUMN)); int idRemoveWatch = -2; if (item->rtti() == RTTI_WATCH_VAR_ITEM) { @@ -441,7 +441,7 @@ void VariableTree::maybeTip(const TQPoint &p) // ************************************************************************** LazyFetchItem::LazyFetchItem(VariableTree *parent) - : KListViewItem(parent), + : TDEListViewItem(parent), activationId_(0), waitingForData_(false) { @@ -451,7 +451,7 @@ LazyFetchItem::LazyFetchItem(VariableTree *parent) // ************************************************************************** LazyFetchItem::LazyFetchItem(LazyFetchItem *parent) - : KListViewItem(parent), + : TDEListViewItem(parent), activationId_(0), waitingForData_(false) { diff --git a/languages/ruby/debugger/variablewidget.h b/languages/ruby/debugger/variablewidget.h index fa56aa6c..bac6d669 100644 --- a/languages/ruby/debugger/variablewidget.h +++ b/languages/ruby/debugger/variablewidget.h @@ -92,7 +92,7 @@ private: /***************************************************************************/ /***************************************************************************/ -class VariableTree : public KListView, public TQToolTip +class VariableTree : public TDEListView, public TQToolTip { Q_OBJECT @@ -150,7 +150,7 @@ public slots: void slotPressed(TQListViewItem * item); private slots: - void slotContextMenu(KListView *, TQListViewItem *item); + void slotContextMenu(TDEListView *, TQListViewItem *item); private: int activationId_; @@ -169,7 +169,7 @@ private: /***************************************************************************/ /***************************************************************************/ -class LazyFetchItem : public KListViewItem +class LazyFetchItem : public TDEListViewItem { public: LazyFetchItem(VariableTree *parent); diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index 7111ffca..0a963043 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -47,28 +47,28 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr setInstance(RubySupportFactory::instance()); setXMLFile("kdevrubysupport.rc"); - KAction *action; - action = new KAction( i18n("&Run"), "exec", SHIFT + Key_F9, + TDEAction *action; + action = new TDEAction( i18n("&Run"), "exec", SHIFT + Key_F9, this, TQT_SLOT(slotRun()), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Starts an application.")); action->setIcon("ruby_run.png"); - action = new KAction( i18n("Run Test Under Cursor"), "exec", ALT + Key_F9, + action = new TDEAction( i18n("Run Test Under Cursor"), "exec", ALT + Key_F9, this, TQT_SLOT(slotRunTestUnderCursor()), actionCollection(), "build_execute_test_function" ); action->setToolTip(i18n("Run Test Under Cursor")); action->setWhatsThis(i18n("<b>Run Test Under Cursor</b><p>Runs the function under the cursor as test.")); - action = new KAction( i18n("Launch Browser"), "network", 0, this, TQT_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); + action = new TDEAction( i18n("Launch Browser"), "network", 0, this, TQT_SLOT(slotBrowse()), actionCollection(), "build_launch_browser" ); action->setToolTip(i18n("Launch Browser")); action->setWhatsThis(i18n("<b>Launch Browser</b><p>Opens a web browser pointing to the Ruby Rails server") ); - action = new KAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQT_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); - action = new KAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQT_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); - action = new KAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQT_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); - action = new KAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQT_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); + action = new TDEAction( i18n("Switch To Controller"), 0, CTRL+ALT+Key_1, this, TQT_SLOT(slotSwitchToController()), actionCollection(), "switch_to_controller" ); + action = new TDEAction( i18n("Switch To Model"), 0, CTRL+ALT+Key_2, this, TQT_SLOT(slotSwitchToModel()), actionCollection(), "switch_to_model" ); + action = new TDEAction( i18n("Switch To View"), 0, CTRL+ALT+Key_3, this, TQT_SLOT(slotSwitchToView()), actionCollection(), "switch_to_view" ); + action = new TDEAction( i18n("Switch To Test"), 0, CTRL+ALT+Key_4, this, TQT_SLOT(slotSwitchToTest()), actionCollection(), "switch_to_test" ); kdDebug() << "Creating RubySupportPart" << endl; diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index 633a687d..02112d78 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -26,9 +26,9 @@ #include "sqlsupport_part.h" SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, - const KShortcut& cut, + const TDEShortcut& cut, const TQObject *receiver, const char *slot, - KActionCollection *parent, const char *name) + TDEActionCollection *parent, const char *name) : KWidgetAction( m_combo = new KComboBox(), text, cut, 0, 0, parent, name), m_part(part) { m_combo->setEditable( false ); diff --git a/languages/sql/sqlactions.h b/languages/sql/sqlactions.h index 28b7ea63..20923a15 100644 --- a/languages/sql/sqlactions.h +++ b/languages/sql/sqlactions.h @@ -24,9 +24,9 @@ class SqlListAction : public KWidgetAction Q_OBJECT public: - SqlListAction( SQLSupportPart *part, const TQString &text, const KShortcut& cut, + SqlListAction( SQLSupportPart *part, const TQString &text, const TDEShortcut& cut, const TQObject *receiver, const char *slot, - KActionCollection *parent, const char *name ); + TDEActionCollection *parent, const char *name ); void setCurrentConnectionName(const TQString &name); TQString currentConnectionName() const; void refresh(); diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index 580d99c5..d5b6f91c 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -39,8 +39,8 @@ SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStri setInstance( SQLSupportFactory::instance() ); setXMLFile( "kdevsqlsupport.rc" ); - KAction *action; - action = new KAction( i18n( "&Run" ), "exec", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" ); + TDEAction *action; + action = new TDEAction( i18n( "&Run" ), "exec", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" ); action->setToolTip(i18n("Run")); action->setWhatsThis(i18n("<b>Run</b><p>Executes a SQL script.")); diff --git a/lib/interfaces/kdevcore.h b/lib/interfaces/kdevcore.h index 3d58a1d7..73048761 100644 --- a/lib/interfaces/kdevcore.h +++ b/lib/interfaces/kdevcore.h @@ -65,7 +65,7 @@ the ability to add own items into the menu. For example, VCS plugin could add "commit" and "update" menu items to the context menu of a file. <b>How to use context from a plugin:</b> --# Create a popup menu in context menu event handler: @code KPopupMenu menu(this); @endcode +-# Create a popup menu in context menu event handler: @code TDEPopupMenu menu(this); @endcode -# Create a context: @code MyContext context(param). @endcode -# Fill a context menu: @code core()->fillContextMenu(&menu, &context); @endcode -# Show the popup menu: @code menu.exec(event->globalPos()); @endcode diff --git a/lib/interfaces/kdevmainwindow.h b/lib/interfaces/kdevmainwindow.h index 27f63273..1a2ea9b6 100644 --- a/lib/interfaces/kdevmainwindow.h +++ b/lib/interfaces/kdevmainwindow.h @@ -26,7 +26,7 @@ class TQWidget; class KStatusBar; -class KMainWindow; +class TDEMainWindow; /** @file kdevmainwindow.h @@ -91,8 +91,8 @@ public: @param caption the caption to set.*/ virtual void setCurrentDocumentCaption( const TQString &caption ) = 0; - /**@return KMainWindow object which actually represents the main window.*/ - virtual KMainWindow *main() = 0; + /**@return TDEMainWindow object which actually represents the main window.*/ + virtual TDEMainWindow *main() = 0; /**@return KStatusBar object which actually represents the status bar in the main window.*/ KStatusBar *statusBar(); diff --git a/lib/util/tdescriptactionmanager.cpp b/lib/util/tdescriptactionmanager.cpp index 619b974d..a74841e5 100644 --- a/lib/util/tdescriptactionmanager.cpp +++ b/lib/util/tdescriptactionmanager.cpp @@ -32,7 +32,7 @@ #include <tqfileinfo.h> #include <tqtimer.h> -KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ) +KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, TDEActionCollection *ac ) : TQObject(interface), KScriptClientInterface( ) { m_interface = 0L; @@ -52,7 +52,7 @@ KScriptAction::KScriptAction( const TQString &scriptDesktopFile, TQObject *inter TDETrader::OfferList offers = TDETrader::self()->query( "KScriptRunner/KScriptRunner", scriptTypeQuery ); if ( !offers.isEmpty() ) { - m_action = new KAction(m_scriptName, KShortcut(), this, TQT_SLOT(activate()), ac, "script"); + m_action = new TDEAction(m_scriptName, TDEShortcut(), this, TQT_SLOT(activate()), ac, "script"); m_isValid = true; m_timeout = new TQTimer(this); TQString icon = desktop.readIcon(); @@ -73,7 +73,7 @@ KScriptAction::~KScriptAction() -KAction * KScriptAction::action( ) +TDEAction * KScriptAction::action( ) { return m_action; } @@ -119,7 +119,7 @@ void KScriptAction::scriptFinished() m_refs--; } -KScriptActionManager::KScriptActionManager( TQObject *parent, KActionCollection * ac ) : TQObject(parent), m_ac(ac) +KScriptActionManager::KScriptActionManager( TQObject *parent, TDEActionCollection * ac ) : TQObject(parent), m_ac(ac) { m_actions.setAutoDelete(true); } @@ -129,10 +129,10 @@ KScriptActionManager::~ KScriptActionManager( ) m_actions.clear(); } -TQPtrList< KAction > KScriptActionManager::scripts( TQObject * interface , const TQStringList &dirs) const +TQPtrList< TDEAction > KScriptActionManager::scripts( TQObject * interface , const TQStringList &dirs) const { m_actions.clear(); - TQPtrList<KAction> actions; + TQPtrList<TDEAction> actions; TQStringList scripts; scripts += TDEGlobal::dirs()->findAllResources("data", diff --git a/lib/util/tdescriptactionmanager.h b/lib/util/tdescriptactionmanager.h index c2e43238..6c68457b 100644 --- a/lib/util/tdescriptactionmanager.h +++ b/lib/util/tdescriptactionmanager.h @@ -24,14 +24,14 @@ #include <tqobject.h> #include <tqptrlist.h> -class KAction; -class KActionCollection; +class TDEAction; +class TDEActionCollection; class KScriptInterface; class KScriptActionManager; class TQTimer; /** -* Connects a KAction to a script runner. +* Connects a TDEAction to a script runner. * * @author ian geiser geiseri@sourcextreme.com */ @@ -40,14 +40,14 @@ class KScriptAction : public TQObject, public KScriptClientInterface { public: - KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, KActionCollection *ac ); + KScriptAction( const TQString &scriptDesktopFile, TQObject *interface, TDEActionCollection *ac ); virtual ~KScriptAction(); /** - * KAction for the current script + * TDEAction for the current script */ - KAction *action(); + TDEAction *action(); /** * Returns the validity of the current script. @@ -75,7 +75,7 @@ private slots: void scriptFinished(); private: - KAction *m_action; + TDEAction *m_action; TQString m_scriptName; TQString m_scriptType; TQString m_scriptFile; @@ -99,7 +99,7 @@ public: /** * Create a script manager that is attached to an action collection. */ - KScriptActionManager( TQObject *parent, KActionCollection *ac ); + KScriptActionManager( TQObject *parent, TDEActionCollection *ac ); ~KScriptActionManager(); /** @@ -110,7 +110,7 @@ public: * the manager will search in $KDEPATH/data/coolapp/data for all desktop * files that are scripts. */ - TQPtrList<KAction> scripts( TQObject *interface, const TQStringList &dirs = TQStringList() ) const; + TQPtrList<TDEAction> scripts( TQObject *interface, const TQStringList &dirs = TQStringList() ) const; signals: /** @@ -136,6 +136,6 @@ signals: private: mutable TQPtrList<KScriptAction> m_actions; - KActionCollection *m_ac; + TDEActionCollection *m_ac; }; #endif diff --git a/lib/widgets/fancylistviewitem.cpp b/lib/widgets/fancylistviewitem.cpp index 6956636e..f3e686c9 100644 --- a/lib/widgets/fancylistviewitem.cpp +++ b/lib/widgets/fancylistviewitem.cpp @@ -58,7 +58,7 @@ TQString FancyListViewItem::text(int column) const { TQColor FancyListViewItem::backgroundColor(int col) { - return KListViewItem::backgroundColor(col); + return TDEListViewItem::backgroundColor(col); } diff --git a/lib/widgets/fancylistviewitem.h b/lib/widgets/fancylistviewitem.h index 49dc5600..24b17d0a 100644 --- a/lib/widgets/fancylistviewitem.h +++ b/lib/widgets/fancylistviewitem.h @@ -119,16 +119,16 @@ class TextPaintItem { }; ///does not support multiple column, a "column" represents a part of the real first column -///KListViewItem is only needed for the background-color +///TDEListViewItem is only needed for the background-color -class FancyListViewItem : public KListViewItem +class FancyListViewItem : public TDEListViewItem { public: - FancyListViewItem(TextPaintStyleStore& styles, TQListView *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { + FancyListViewItem(TextPaintStyleStore& styles, TQListView *parent, const TQString &label1, const TQString &label2="") : TDEListViewItem(parent, label1, label2), m_styles(styles) { init(label1, label2); } - FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *parent, const TQString &label1, const TQString &label2="") : KListViewItem(parent, label1, label2), m_styles(styles) { + FancyListViewItem(TextPaintStyleStore& styles, TQListViewItem *parent, const TQString &label1, const TQString &label2="") : TDEListViewItem(parent, label1, label2), m_styles(styles) { init(label1, label2); } diff --git a/lib/widgets/kcomboview.cpp b/lib/widgets/kcomboview.cpp index 93a6612f..a18dc93c 100644 --- a/lib/widgets/kcomboview.cpp +++ b/lib/widgets/kcomboview.cpp @@ -86,7 +86,7 @@ void KComboView::setDefaultText( const TQString & text ) void KComboView::setUpListView() { - KListView *listView = new KListView( this, "in-combo" ); + TDEListView *listView = new TDEListView( this, "in-combo" ); listView->setRootIsDecorated( false ); listView->setAllColumnsShowFocus(true); listView->addColumn(""); diff --git a/lib/widgets/kdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp index 34d5a2c0..e92927ae 100644 --- a/lib/widgets/kdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -31,14 +31,14 @@ KDevHTMLPart::KDevHTMLPart() connect(this, TQT_SIGNAL(completed()), this, TQT_SLOT(slotCompleted())); connect(this, TQT_SIGNAL(canceled(const TQString &)), this, TQT_SLOT(slotCancelled(const TQString &))); - KActionCollection * actions = actionCollection();// new KActionCollection( this ); - reloadAction = new KAction( i18n( "Reload" ), "reload", 0, + TDEActionCollection * actions = actionCollection();// new TDEActionCollection( this ); + reloadAction = new TDEAction( i18n( "Reload" ), "reload", 0, this, TQT_SLOT( slotReload() ), actions, "doc_reload" ); reloadAction->setWhatsThis(i18n("<b>Reload</b><p>Reloads the current document.")); - stopAction = new KAction( i18n( "Stop" ), "stop", 0, + stopAction = new TDEAction( i18n( "Stop" ), "stop", 0, this, TQT_SLOT( slotStop() ), actions, "doc_stop" ); stopAction->setWhatsThis(i18n("<b>Stop</b><p>Stops the loading of current document.")); - duplicateAction = new KAction( i18n( "Duplicate Tab" ), "window_new", 0, + duplicateAction = new TDEAction( i18n( "Duplicate Tab" ), "window_new", 0, this, TQT_SLOT( slotDuplicate() ), actions, "doc_dup" ); duplicateAction->setWhatsThis(i18n("<b>Duplicate window</b><p>Opens current document in a new window.")); printAction = KStdAction::print(this, TQT_SLOT(slotPrint()), actions, "print_doc"); @@ -49,7 +49,7 @@ KDevHTMLPart::KDevHTMLPart() //BEGIN documentation history stuff - m_backAction = new KToolBarPopupAction(i18n("Back"), "back", 0, + m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), actions, "browser_back"); m_backAction->setEnabled( false ); @@ -61,7 +61,7 @@ KDevHTMLPart::KDevHTMLPart() connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPopupActivated(int))); - m_forwardAction = new KToolBarPopupAction(i18n("Forward"), "forward", 0, + m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), actions, "browser_forward"); m_forwardAction->setEnabled( false ); @@ -89,8 +89,8 @@ KDevHTMLPart::KDevHTMLPart() void KDevHTMLPart::popup( const TQString & url, const TQPoint & p ) { -// KPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() ); - KPopupMenu popup(this->widget()); +// TDEPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() ); + TDEPopupMenu popup(this->widget()); bool needSep = false; int idNewWindow = -2; @@ -120,8 +120,8 @@ void KDevHTMLPart::popup( const TQString & url, const TQPoint & p ) printAction->plug(&popup); popup.insertSeparator(); - KAction * incFontAction = this->action("incFontSizes"); - KAction * decFontAction = this->action("decFontSizes"); + TDEAction * incFontAction = this->action("incFontSizes"); + TDEAction * decFontAction = this->action("decFontSizes"); if ( incFontAction && decFontAction ) { incFontAction->plug( &popup ); @@ -129,7 +129,7 @@ void KDevHTMLPart::popup( const TQString & url, const TQPoint & p ) popup.insertSeparator(); } - KAction *ac = action("setEncoding"); + TDEAction *ac = action("setEncoding"); if (ac) ac->plug(&popup); @@ -403,7 +403,7 @@ void KDevHTMLPart::slotForward() void KDevHTMLPart::slotBackAboutToShow() { - KPopupMenu *popup = m_backAction->popupMenu(); + TDEPopupMenu *popup = m_backAction->popupMenu(); popup->clear(); if ( m_Current == m_history.begin() ) return; @@ -428,7 +428,7 @@ void KDevHTMLPart::slotBackAboutToShow() void KDevHTMLPart::slotForwardAboutToShow() { - KPopupMenu *popup = m_forwardAction->popupMenu(); + TDEPopupMenu *popup = m_forwardAction->popupMenu(); popup->clear(); if ( m_Current == m_history.fromLast() ) return; diff --git a/lib/widgets/kdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h index 3dbc728e..6c8f7dc3 100644 --- a/lib/widgets/kdevhtmlpart.h +++ b/lib/widgets/kdevhtmlpart.h @@ -12,8 +12,8 @@ Customized TDEHTML part for KDevelop. */ -class KAction; -class KToolBarPopupAction; +class TDEAction; +class TDEToolBarPopupAction; struct DocumentationHistoryEntry { KURL url; @@ -93,17 +93,17 @@ private: TQValueList< DocumentationHistoryEntry > m_history; TQValueList< DocumentationHistoryEntry >::Iterator m_Current; - KToolBarPopupAction* m_backAction; - KToolBarPopupAction* m_forwardAction; + TDEToolBarPopupAction* m_backAction; + TDEToolBarPopupAction* m_forwardAction; bool m_restoring; TQString m_context; - KAction *stopAction; - KAction *reloadAction; - KAction *duplicateAction; - KAction *printAction; - KAction *copyAction; + TDEAction *stopAction; + TDEAction *reloadAction; + TDEAction *duplicateAction; + TDEAction *printAction; + TDEAction *copyAction; int m_options; }; diff --git a/lib/widgets/klistviewaction.cpp b/lib/widgets/klistviewaction.cpp index 631ad9d1..2d687027 100644 --- a/lib/widgets/klistviewaction.cpp +++ b/lib/widgets/klistviewaction.cpp @@ -26,19 +26,19 @@ #include <tdeconfig.h> #include <kglobal.h> -KListViewAction::~KListViewAction() +TDEListViewAction::~TDEListViewAction() { TDEConfig *config = TDEGlobal::config(); if (config && m_view->name()) { - config->setGroup("KListViewAction"); + config->setGroup("TDEListViewAction"); config->writeEntry(m_view->name(), m_view->width()); } delete m_view; } -KListViewAction::KListViewAction(KComboView *view, const TQString & text, const KShortcut & cut, - const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name ): +TDEListViewAction::TDEListViewAction(KComboView *view, const TQString & text, const TDEShortcut & cut, + const TQObject * receiver, const char * slot, TDEActionCollection * parent, const char * name ): KWidgetAction(view, text, cut, receiver, slot, parent, name), m_view(view) { m_view->setDuplicatesEnabled(false); @@ -47,8 +47,8 @@ KListViewAction::KListViewAction(KComboView *view, const TQString & text, const loadComboWidth(); } -KListViewAction::KListViewAction( KComboView * view, const TQString & text, const KShortcut & cut, - const TQObject * receiver, const char * slot, KActionCollection * parent, const char * name, const bool /*dummy*/ ): +TDEListViewAction::TDEListViewAction( KComboView * view, const TQString & text, const TDEShortcut & cut, + const TQObject * receiver, const char * slot, TDEActionCollection * parent, const char * name, const bool /*dummy*/ ): KWidgetAction(new ResizableCombo(view), text, cut, receiver, slot, parent, name), m_view(view) { m_view->setDuplicatesEnabled(false); @@ -57,29 +57,29 @@ KListViewAction::KListViewAction( KComboView * view, const TQString & text, cons loadComboWidth(); } -KComboView * KListViewAction::view( ) const +KComboView * TDEListViewAction::view( ) const { return m_view; } -void KListViewAction::setToolTip( const TQString & str ) +void TDEListViewAction::setToolTip( const TQString & str ) { TQToolTip::remove(m_view); TQToolTip::add(m_view, str); } -void KListViewAction::setWhatsThis( const TQString & str ) +void TDEListViewAction::setWhatsThis( const TQString & str ) { TQWhatsThis::remove(m_view); TQWhatsThis::add(m_view, str); } -void KListViewAction::loadComboWidth( ) +void TDEListViewAction::loadComboWidth( ) { TDEConfig *config = TDEGlobal::config(); if (config && m_view->name()) { - config->setGroup("KListViewAction"); + config->setGroup("TDEListViewAction"); m_view->setMinimumWidth(config->readNumEntry(m_view->name(), m_view->defaultWidth())); } } diff --git a/lib/widgets/klistviewaction.h b/lib/widgets/klistviewaction.h index dfe3414a..703f58cf 100644 --- a/lib/widgets/klistviewaction.h +++ b/lib/widgets/klistviewaction.h @@ -35,13 +35,13 @@ Widget action with KComboView. Widget action with KComboView. Can be used on toolbars. It appears as @ref ResizableCombo. */ -class KListViewAction: public KWidgetAction +class TDEListViewAction: public KWidgetAction { public: - KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name); - KListViewAction(KComboView *view, const TQString &text, const KShortcut &cut, const TQObject *receiver, const char *slot, KActionCollection *parent, const char *name, const bool); + TDEListViewAction(KComboView *view, const TQString &text, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TDEActionCollection *parent, const char *name); + TDEListViewAction(KComboView *view, const TQString &text, const TDEShortcut &cut, const TQObject *receiver, const char *slot, TDEActionCollection *parent, const char *name, const bool); - ~KListViewAction(); + ~TDEListViewAction(); KComboView *view() const; void setToolTip(const TQString & str); diff --git a/lib/widgets/ksavealldialog.cpp b/lib/widgets/ksavealldialog.cpp index 72618589..46736be2 100644 --- a/lib/widgets/ksavealldialog.cpp +++ b/lib/widgets/ksavealldialog.cpp @@ -57,7 +57,7 @@ KSaveSelectDialog::KSaveSelectDialog( KURL::List const & filelist, KURL::List co (void)new TQLabel( i18n("The following files have been modified. Save them?"), top ); - _listview = new KListView( top ); + _listview = new TDEListView( top ); _listview->addColumn( "" ); _listview->header()->hide(); _listview->setResizeMode( TQListView::LastColumn ); @@ -149,7 +149,7 @@ KSaveAllDialog::KSaveAllDialog( const TQStringList& filenames, TQWidget* parent TQVBox *top = makeVBoxMainWidget(); (void)new TQLabel( i18n("The following files have been modified. Save them?"), top ); - KListBox* lb = new KListBox( top ); + TDEListBox* lb = new TDEListBox( top ); lb->setMinimumHeight( lb->fontMetrics().height() * 5 ); lb->insertStringList( filenames ); diff --git a/lib/widgets/ksavealldialog.h b/lib/widgets/ksavealldialog.h index a122b11a..d7b989c5 100644 --- a/lib/widgets/ksavealldialog.h +++ b/lib/widgets/ksavealldialog.h @@ -24,7 +24,7 @@ #include <kdialogbase.h> #include <kurl.h> -class KListView; +class TDEListView; /** @file ksavealldialog.h Dialogs to save multiple files. @@ -51,7 +51,7 @@ private slots: void cancel(); private: - KListView * _listview; + TDEListView * _listview; }; diff --git a/lib/widgets/processwidget.cpp b/lib/widgets/processwidget.cpp index 1f2e1a5e..5bb0bc4e 100644 --- a/lib/widgets/processwidget.cpp +++ b/lib/widgets/processwidget.cpp @@ -104,7 +104,7 @@ void ProcessListBoxItem::paint(TQPainter *p) ProcessWidget::ProcessWidget(TQWidget *parent, const char *name) - : KListBox(parent, name) + : TDEListBox(parent, name) { setFocusPolicy(TQ_NoFocus); diff --git a/lib/widgets/processwidget.h b/lib/widgets/processwidget.h index b0ad10f7..0ee5b3e6 100644 --- a/lib/widgets/processwidget.h +++ b/lib/widgets/processwidget.h @@ -55,7 +55,7 @@ private: * This class is designed to share code between the * grep and application output widgets. */ -class ProcessWidget : public KListBox +class ProcessWidget : public TDEListBox { Q_OBJECT diff --git a/lib/widgets/propeditor/pfontbutton.cpp b/lib/widgets/propeditor/pfontbutton.cpp index 67c86995..fda1322b 100644 --- a/lib/widgets/propeditor/pfontbutton.cpp +++ b/lib/widgets/propeditor/pfontbutton.cpp @@ -37,7 +37,7 @@ PFontButton::PFontButton(MultiProperty* property, TQWidget* parent, const char* :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); - m_edit = new KFontRequester(this); + m_edit = new TDEFontRequester(this); m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); #ifndef PURE_QT m_edit->button()->setText(i18n("...")); diff --git a/lib/widgets/propeditor/pfontbutton.h b/lib/widgets/propeditor/pfontbutton.h index 761cb003..3f7d54c6 100644 --- a/lib/widgets/propeditor/pfontbutton.h +++ b/lib/widgets/propeditor/pfontbutton.h @@ -22,7 +22,7 @@ #include "propertywidget.h" -class KFontRequester; +class TDEFontRequester; namespace PropertyLib{ @@ -44,7 +44,7 @@ protected slots: void updateProperty(const TQFont& font); private: - KFontRequester *m_edit; + TDEFontRequester *m_edit; }; diff --git a/lib/widgets/propeditor/pfontcombo.cpp b/lib/widgets/propeditor/pfontcombo.cpp index 8b0ee7a7..0675a6e0 100644 --- a/lib/widgets/propeditor/pfontcombo.cpp +++ b/lib/widgets/propeditor/pfontcombo.cpp @@ -37,11 +37,11 @@ PFontCombo::PFontCombo(MultiProperty *property, TQWidget *parent, const char *na :PropertyWidget(property, parent, name) { TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0); - m_edit = new KFontCombo(this); + m_edit = new TDEFontCombo(this); m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding); l->addWidget(m_edit); - /*adymo: KFontCombo seems to have a bug: when it is not editable, the signals + /*adymo: TDEFontCombo seems to have a bug: when it is not editable, the signals activated(int) and textChanged(const TQString &) are not emitted*/ #ifdef PURE_QT TQFontDatabase fonts; diff --git a/lib/widgets/propeditor/pfontcombo.h b/lib/widgets/propeditor/pfontcombo.h index f3ede408..e1a90b69 100644 --- a/lib/widgets/propeditor/pfontcombo.h +++ b/lib/widgets/propeditor/pfontcombo.h @@ -23,10 +23,10 @@ #include "propertywidget.h" #ifdef PURE_QT -#define KFontCombo TQComboBox +#define TDEFontCombo TQComboBox #endif -class KFontCombo; +class TDEFontCombo; namespace PropertyLib{ @@ -49,7 +49,7 @@ private slots: void updateProperty(const TQString &val); private: - KFontCombo *m_edit; + TDEFontCombo *m_edit; }; } diff --git a/lib/widgets/propeditor/propertyeditor.cpp b/lib/widgets/propeditor/propertyeditor.cpp index c7eafd8f..1bf3adc9 100644 --- a/lib/widgets/propeditor/propertyeditor.cpp +++ b/lib/widgets/propeditor/propertyeditor.cpp @@ -40,16 +40,16 @@ namespace PropertyLib{ -class PropertyItem: public KListViewItem{ +class PropertyItem: public TDEListViewItem{ public: PropertyItem(PropertyEditor *parent, MultiProperty *property) - :KListViewItem(parent, property->description()), m_editor(parent), m_property(property), + :TDEListViewItem(parent, property->description()), m_editor(parent), m_property(property), m_changed(false) { } - PropertyItem(PropertyEditor *editor, KListViewItem *parent, MultiProperty *property) - :KListViewItem(parent, property->description()), m_editor(editor), + PropertyItem(PropertyEditor *editor, TDEListViewItem *parent, MultiProperty *property) + :TDEListViewItem(parent, property->description()), m_editor(editor), m_property(property), m_changed(false) { } @@ -97,12 +97,12 @@ public: m_editor->machine(m_property)->propertyEditor->drawViewer(p, icg, r, valueToDraw); return; } - KListViewItem::paintCell(p, cg, column, width, align); + TDEListViewItem::paintCell(p, cg, column, width, align); } virtual void setup() { - KListViewItem::setup(); + TDEListViewItem::setup(); setHeight(static_cast<int>(height()*1.5)); } @@ -118,15 +118,15 @@ private: }; -class PropertyGroupItem: public KListViewItem{ +class PropertyGroupItem: public TDEListViewItem{ public: - PropertyGroupItem(KListView *parent, const TQString &name) - :KListViewItem(parent, name) + PropertyGroupItem(TDEListView *parent, const TQString &name) + :TDEListViewItem(parent, name) { init(); } - PropertyGroupItem(KListViewItem *parent, const TQString &name) - :KListViewItem(parent, name) + PropertyGroupItem(TDEListViewItem *parent, const TQString &name) + :TDEListViewItem(parent, name) { init(); } @@ -141,11 +141,11 @@ public: p->setBrush(cg.highlight()); p->setPen(cg.highlightedText()); } - KListViewItem::paintCell(p, cg, column, width, align); + TDEListViewItem::paintCell(p, cg, column, width, align); } virtual void setup() { - KListViewItem::setup(); + TDEListViewItem::setup(); setHeight(static_cast<int>(height()*1.4)); } @@ -156,16 +156,16 @@ private: } }; -class SeparatorItem: public KListViewItem{ +class SeparatorItem: public TDEListViewItem{ public: - SeparatorItem(KListView *parent) - :KListViewItem(parent) + SeparatorItem(TDEListView *parent) + :TDEListViewItem(parent) { setSelectable(false); } }; PropertyEditor::PropertyEditor(TQWidget *parent, const char *name) - :KListView(parent, name) + :TDEListView(parent, name) { setSorting(-1); diff --git a/lib/widgets/propeditor/propertyeditor.h b/lib/widgets/propeditor/propertyeditor.h index 7cfa8521..3e683a58 100644 --- a/lib/widgets/propeditor/propertyeditor.h +++ b/lib/widgets/propeditor/propertyeditor.h @@ -24,8 +24,8 @@ #include <klistview.h> #else #include <tqlistview.h> -#define KListView TQListView -#define KListViewItem TQListViewItem +#define TDEListView TQListView +#define TDEListViewItem TQListViewItem #endif #include "propertylist.h" @@ -55,7 +55,7 @@ creation of property widgets from the machine factory. @see Machine @see PropertyMachineFactory */ -class PropertyEditor: public KListView{ +class PropertyEditor: public TDEListView{ Q_OBJECT public: diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index ccfe6be6..beadb5fa 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -76,14 +76,14 @@ AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &) connect(core(), TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(configWidget(KDialogBase*))); - KAction *action; - action = new KAction( i18n("Expand Text"), CTRL + Key_J, + TDEAction *action; + action = new TDEAction( i18n("Expand Text"), CTRL + Key_J, this, TQT_SLOT(slotExpandText()), actionCollection(), "edit_expandtext" ); action->setToolTip( i18n("Expand current word") ); action->setWhatsThis( i18n("<b>Expand current word</b><p>Current word can be completed using the list of similar words in source files.") ); - action = new KAction( i18n("Expand Abbreviation"), CTRL + Key_L, + action = new TDEAction( i18n("Expand Abbreviation"), CTRL + Key_L, this, TQT_SLOT(slotExpandAbbrev()), actionCollection(), "edit_expandabbrev" ); action->setToolTip( i18n("Expand abbreviation") ); diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 1d641040..41e52a03 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -104,10 +104,10 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch templates_listview->header()->hide(); templates_listview->setColumnWidthMode(0, TQListView::Maximum); //to provide horiz scrollbar. - m_templatesMenu = new KPopupMenu(templates_listview); + m_templatesMenu = new TDEPopupMenu(templates_listview); m_templatesMenu->insertItem(i18n("&Add to Favorites"), this, TQT_SLOT(addTemplateToFavourites())); - m_favouritesMenu = new KPopupMenu(favourites_iconview); + m_favouritesMenu = new TDEPopupMenu(favourites_iconview); m_favouritesMenu->insertItem(i18n("&Remove Favorite"), this, TQT_SLOT(removeFavourite())); m_pathIsValid=false; @@ -269,7 +269,7 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch TQListViewItem *item = m_categoryMap.find(ait.current()->category); if (item) { - item = new KListViewItem(item, ait.current()->name); + item = new TDEListViewItem(item, ait.current()->name); item->setPixmap(0, SmallIcon("tdevelop")); } else @@ -971,9 +971,9 @@ void AppWizardDialog::insertCategoryIntoTreeView(const TQString &completeCategor TQListViewItem *item = m_categoryMap.find(category); if (!item) { // not found, create it if (!pParentItem) - pParentItem = new KListViewItem(templates_listview,*it); + pParentItem = new TDEListViewItem(templates_listview,*it); else - pParentItem = new KListViewItem(pParentItem,*it); + pParentItem = new TDEListViewItem(pParentItem,*it); pParentItem->setPixmap(0, SmallIcon("folder")); //pParentItem->setOpen(true); diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h index 7f177e9b..859b1524 100644 --- a/parts/appwizard/appwizarddlg.h +++ b/parts/appwizard/appwizarddlg.h @@ -20,7 +20,7 @@ class TQRadioButton; class KTempFile; class TQWidgetStack; class TQVBox; -class KPopupMenu; +class TDEPopupMenu; class TQHBoxLayout; class KArchiveDirectory; class KArchiveFile; @@ -192,8 +192,8 @@ private: //data bool m_projectLocationWasChanged; VcsForm *m_vcsForm; bool m_pathIsValid; - KPopupMenu* m_favouritesMenu; - KPopupMenu* m_templatesMenu; + TDEPopupMenu* m_favouritesMenu; + TDEPopupMenu* m_templatesMenu; TQDict<KDevLicense> m_licenses; TQDict<KDevVCSIntegrator> m_integrators; diff --git a/parts/appwizard/appwizarddlgbase.ui b/parts/appwizard/appwizarddlgbase.ui index 525aeef0..a2303139 100644 --- a/parts/appwizard/appwizarddlgbase.ui +++ b/parts/appwizard/appwizarddlgbase.ui @@ -41,7 +41,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string></string> diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp index f08e0c87..bcc21127 100644 --- a/parts/appwizard/appwizardpart.cpp +++ b/parts/appwizard/appwizardpart.cpp @@ -40,9 +40,9 @@ AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringL setInstance(AppWizardFactory::instance()); setXMLFile("kdevappwizard.rc"); - KAction *action; + TDEAction *action; - action = new KAction( i18n("&New Project..."), "window_new", 0, + action = new TDEAction( i18n("&New Project..."), "window_new", 0, this, TQT_SLOT(slotNewProject()), actionCollection(), "project_new" ); action->setToolTip( i18n("Generate a new project from a template") ); @@ -51,7 +51,7 @@ AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringL "It helps you to generate a skeleton for your " "application from a set of templates.") ); - action = new KAction( i18n("&Import Existing Project..."),"wizard", 0, + action = new TDEAction( i18n("&Import Existing Project..."),"wizard", 0, this, TQT_SLOT(slotImportProject()), actionCollection(), "project_import" ); action->setToolTip( i18n("Import existing project") ); diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index ed0720a4..f9d95ed6 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -50,13 +50,13 @@ AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) setXMLFile("kdevpart_astyle.rc"); - formatTextAction = new KAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle"); + formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle"); formatTextAction->setEnabled(false); formatTextAction->setToolTip(i18n("Reformat source")); formatTextAction->setWhatsThis(i18n("<b>Reformat source</b><p>Source reformatting functionality using <b>astyle</b> library. " "Also available in <b>New Class</b> and <b>Subclassing</b> wizards.")); - formatFileAction = new KAction(i18n("Format files"), 0, this, TQT_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); + formatFileAction = new TDEAction(i18n("Format files"), 0, this, TQT_SLOT(formatFilesSelect()), actionCollection(), "tools_astyle"); formatFileAction->setEnabled(false); formatFileAction->setToolTip(i18n("Format files")); formatFileAction->setWhatsThis(i18n("<b>Fomat files</b><p>Formatting functionality using <b>astyle</b> library. " diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h index eed15022..cd7c757e 100644 --- a/parts/astyle/astyle_part.h +++ b/parts/astyle/astyle_part.h @@ -61,8 +61,8 @@ private: void loadGlobal(); ConfigWidgetProxy *m_configProxy; - KAction *formatTextAction; - KAction *formatFileAction; + TDEAction *formatTextAction; + TDEAction *formatFileAction; // the configurable options. TQMap<TQString, TQVariant> m_project; diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index a5eec6a3..f15f6289 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -139,7 +139,7 @@ private: }; BookmarksWidget::BookmarksWidget(BookmarksPart *part) - : KListView(0, "bookmarks widget"), TQToolTip( viewport() ), + : TDEListView(0, "bookmarks widget"), TQToolTip( viewport() ), _part( part ) { @@ -263,7 +263,7 @@ void BookmarksWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int ) { _selectedItem = static_cast<BookmarkItem *>(item); - KPopupMenu popup; + TDEPopupMenu popup; if ( _selectedItem->isBookmark() ) { diff --git a/parts/bookmarks/bookmarks_widget.h b/parts/bookmarks/bookmarks_widget.h index bc8c90ca..ed645e0e 100644 --- a/parts/bookmarks/bookmarks_widget.h +++ b/parts/bookmarks/bookmarks_widget.h @@ -26,7 +26,7 @@ class BookmarksPart; class BookmarkItem; class BookmarksConfig; -class BookmarksWidget : public KListView, public TQToolTip +class BookmarksWidget : public TDEListView, public TQToolTip { Q_OBJECT diff --git a/parts/classview/classtoolwidget.cpp b/parts/classview/classtoolwidget.cpp index 41020bd0..878cd44b 100644 --- a/parts/classview/classtoolwidget.cpp +++ b/parts/classview/classtoolwidget.cpp @@ -29,11 +29,11 @@ ClassToolWidget::~ClassToolWidget() {} -KPopupMenu *ClassToolWidget::createPopup() +TDEPopupMenu *ClassToolWidget::createPopup() { - KPopupMenu *popup = contextItem? contextItem->createPopup() : 0; + TDEPopupMenu *popup = contextItem? contextItem->createPopup() : 0; if (!popup) { - popup = new KPopupMenu(this); + popup = new TDEPopupMenu(this); popup->insertTitle(i18n("Class Tool")); } diff --git a/parts/classview/classtoolwidget.h b/parts/classview/classtoolwidget.h index 07182f4e..526d5696 100644 --- a/parts/classview/classtoolwidget.h +++ b/parts/classview/classtoolwidget.h @@ -32,7 +32,7 @@ public: void insertAllClassAttributes(ParsedClass *parsedClass, PIAccess filter); protected: - virtual KPopupMenu *createPopup(); + virtual TDEPopupMenu *createPopup(); private: void addClassAndAttributes(ParsedClass *parsedClass, PIAccess filter, ClassTreeItem **lastItem); diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp index 6aefc1fa..43604b42 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -31,14 +31,14 @@ #include "classviewpart.h" #include "classtooldlg.h" -KPopupMenu *ClassTreeItem::createPopup() +TDEPopupMenu *ClassTreeItem::createPopup() { if (!m_item || m_item->itemType() == PIT_SCOPE) return 0; KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features(); - KPopupMenu *popup = new KPopupMenu(); + TDEPopupMenu *popup = new TDEPopupMenu(); if (features & KDevLanguageSupport::Declarations) popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) ); if (m_item->itemType() == PIT_METHOD) @@ -448,7 +448,7 @@ void ClassToolTip::maybeTip(const TQPoint &p) ClassTreeBase::ClassTreeBase(ClassViewPart *part, TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { setFocusPolicy(ClickFocus); setRootIsDecorated(true); @@ -572,7 +572,7 @@ void ClassTreeBase::slotContextMenuRequested(TQListViewItem *item, const TQPoint { contextItem = static_cast<ClassTreeItem*>(item); - KPopupMenu *popup = createPopup(); + TDEPopupMenu *popup = createPopup(); popup->exec(p); delete popup; } diff --git a/parts/classview/classtreebase.h b/parts/classview/classtreebase.h index 25ef4f91..fb218387 100644 --- a/parts/classview/classtreebase.h +++ b/parts/classview/classtreebase.h @@ -24,10 +24,10 @@ #include "parsedscript.h" class ClassTreeItem; -class KPopupMenu; +class TDEPopupMenu; -class ClassTreeBase : public KListView +class ClassTreeBase : public TDEListView { Q_OBJECT @@ -43,7 +43,7 @@ protected: void setTreeState(TreeState state); ClassTreeItem *contextItem; - virtual KPopupMenu *createPopup() = 0; + virtual TDEPopupMenu *createPopup() = 0; private slots: void slotItemExecuted(TQListViewItem*); @@ -98,7 +98,7 @@ public: // m_item has been deleted. void notify() { m_item = 0; } - KPopupMenu *createPopup(); + TDEPopupMenu *createPopup(); bool isOrganizer() { return !m_item; } void init() { diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index a30f6158..7bf70310 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -195,7 +195,7 @@ void ClassViewPart::slotProjectClosed( ) void ClassViewPart::setupActions( ) { - m_functionsnav = new KListViewAction( new KComboView(true, 150, 0, "m_functionsnav_combo", new FunctionCompletion() ), i18n("Functions Navigation"), 0, 0, 0, actionCollection(), "functionsnav_combo", true ); + m_functionsnav = new TDEListViewAction( new KComboView(true, 150, 0, "m_functionsnav_combo", new FunctionCompletion() ), i18n("Functions Navigation"), 0, 0, 0, actionCollection(), "functionsnav_combo", true ); connect(m_functionsnav->view(), TQT_SIGNAL(activated(TQListViewItem*)), navigator, TQT_SLOT(selectFunctionNav(TQListViewItem*))); // m_functionsnav->view()->setEditable(false); connect(m_functionsnav->view(), TQT_SIGNAL(focusGranted()), navigator, TQT_SLOT(functionNavFocused())); @@ -205,11 +205,11 @@ void ClassViewPart::setupActions( ) // m_functionsnav->view()->setCurrentText(NAV_NODEFINITION); m_functionsnav->view()->setDefaultText(NAV_NODEFINITION); - new KAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" ); + new TDEAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" ); if (langHasFeature(KDevLanguageSupport::Classes)) { - KAction *ac = new KAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia"); + TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia"); ac->setToolTip(i18n("Class inheritance diagram")); ac->setWhatsThis(i18n("<b>Class inheritance diagram</b><p>Displays inheritance relationship between classes in project. " "Note, it does not display classes outside inheritance hierarchy.")); diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h index 18ecdad4..271830ba 100644 --- a/parts/classview/classviewpart.h +++ b/parts/classview/classviewpart.h @@ -46,9 +46,9 @@ namespace KTextEditor class ClassViewWidget; -class KListViewAction; +class TDEListViewAction; class TQListViewItem; -class KToolBarPopupAction; +class TDEToolBarPopupAction; class NamespaceItem; class Navigator; class HierarchyDialog; @@ -62,7 +62,7 @@ public: bool langHasFeature(KDevLanguageSupport::Features feature); - KListViewAction *m_functionsnav; + TDEListViewAction *m_functionsnav; Navigator *navigator; inline ClassViewWidget* widget() { diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index 6fdf32ae..9142d110 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -49,7 +49,7 @@ // namespace ?!? ClassViewWidget::ClassViewWidget( ClassViewPart * part ) - : KListView( 0, "ClassViewWidget" ), TQToolTip( viewport() ), m_part( part ), m_projectDirectoryLength( 0 ) + : TDEListView( 0, "ClassViewWidget" ), TQToolTip( viewport() ), m_part( part ), m_projectDirectoryLength( 0 ) { addColumn( "" ); header()->hide(); @@ -67,32 +67,32 @@ ClassViewWidget::ClassViewWidget( ClassViewPart * part ) TQStringList lst; lst << i18n( "Group by Directories" ) << i18n( "Plain List" ) << i18n( "Java Like Mode" ); - m_actionViewMode = new KSelectAction( i18n("View Mode"), KShortcut(), m_part->actionCollection(), "classview_mode" ); + m_actionViewMode = new TDESelectAction( i18n("View Mode"), TDEShortcut(), m_part->actionCollection(), "classview_mode" ); m_actionViewMode->setItems( lst ); m_actionViewMode->setWhatsThis(i18n("<b>View mode</b><p>Class browser items can be grouped by directories, listed in a plain or java like view.")); - m_actionNewClass = new KAction( i18n("New Class..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotNewClass()), + m_actionNewClass = new TDEAction( i18n("New Class..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotNewClass()), m_part->actionCollection(), "classview_new_class" ); m_actionNewClass->setWhatsThis(i18n("<b>New class</b><p>Calls the <b>New Class</b> wizard.")); - m_actionCreateAccessMethods = new KAction( i18n("Create get/set Methods"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); + m_actionCreateAccessMethods = new TDEAction( i18n("Create get/set Methods"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotCreateAccessMethods()), m_part->actionCollection(), "classview_create_access_methods" ); - m_actionAddMethod = new KAction( i18n("Add Method..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddMethod()), + m_actionAddMethod = new TDEAction( i18n("Add Method..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddMethod()), m_part->actionCollection(), "classview_add_method" ); m_actionAddMethod->setWhatsThis(i18n("<b>Add method</b><p>Calls the <b>New Method</b> wizard.")); - m_actionAddAttribute = new KAction( i18n("Add Attribute..."), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddAttribute()), + m_actionAddAttribute = new TDEAction( i18n("Add Attribute..."), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotAddAttribute()), m_part->actionCollection(), "classview_add_attribute" ); m_actionAddAttribute->setWhatsThis(i18n("<b>Add attribute</b><p>Calls the <b>New Attribute</b> wizard.")); - m_actionOpenDeclaration = new KAction( i18n("Open Declaration"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenDeclaration()), + m_actionOpenDeclaration = new TDEAction( i18n("Open Declaration"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenDeclaration()), m_part->actionCollection(), "classview_open_declaration" ); m_actionOpenDeclaration->setWhatsThis(i18n("<b>Open declaration</b><p>Opens a file where the selected item is declared and jumps to the declaration line.")); - m_actionOpenImplementation = new KAction( i18n("Open Implementation"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenImplementation()), + m_actionOpenImplementation = new TDEAction( i18n("Open Implementation"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotOpenImplementation()), m_part->actionCollection(), "classview_open_implementation" ); m_actionOpenImplementation->setWhatsThis(i18n("<b>Open implementation</b><p>Opens a file where the selected item is defined (implemented) and jumps to the definition line.")); - m_actionFollowEditor = new KToggleAction( i18n("Follow Editor"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); + m_actionFollowEditor = new TDEToggleAction( i18n("Follow Editor"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotFollowEditor()), m_part->actionCollection(), "classview_follow_editor" ); TDEConfig* config = m_part->instance()->config(); config->setGroup( "General" ); @@ -138,7 +138,7 @@ void ClassViewWidget::slotExecuted( TQListViewItem* item ) void ClassViewWidget::clear( ) { - KListView::clear(); + TDEListView::clear(); removedText.clear(); m_projectItem = 0; } @@ -315,7 +315,7 @@ void ClassViewWidget::removeFile( const TQString& fileName ) void ClassViewWidget::contentsContextMenuEvent( TQContextMenuEvent * ev ) { - KPopupMenu menu( this ); + TDEPopupMenu menu( this ); ClassViewItem* item = dynamic_cast<ClassViewItem*>( selectedItem() ); diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h index e3113035..586ac41e 100644 --- a/parts/classview/classviewwidget.h +++ b/parts/classview/classviewwidget.h @@ -40,10 +40,10 @@ class ClassDomBrowserItem; class TypeAliasDomBrowserItem; class FunctionDomBrowserItem; class VariableDomBrowserItem; -class KSelectAction; -class KToggleAction; +class TDESelectAction; +class TDEToggleAction; -class ClassViewWidget : public KListView, public TQToolTip +class ClassViewWidget : public TDEListView, public TQToolTip { Q_OBJECT @@ -98,14 +98,14 @@ private: TQString m_projectDirectory; int m_projectDirectoryLength; FolderBrowserItem* m_projectItem; - KSelectAction* m_actionViewMode; - KAction* m_actionNewClass; - KAction* m_actionAddMethod; - KAction* m_actionAddAttribute; - KAction* m_actionOpenDeclaration; - KAction* m_actionOpenImplementation; - KAction* m_actionCreateAccessMethods; - KToggleAction * m_actionFollowEditor; + TDESelectAction* m_actionViewMode; + TDEAction* m_actionNewClass; + TDEAction* m_actionAddMethod; + TDEAction* m_actionAddAttribute; + TDEAction* m_actionOpenDeclaration; + TDEAction* m_actionOpenImplementation; + TDEAction* m_actionCreateAccessMethods; + TDEToggleAction * m_actionFollowEditor; bool m_doFollowEditor; friend class ClassViewItem; friend class FolderBrowserItem; diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index f5959d73..b79847d1 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -110,14 +110,14 @@ Navigator::Navigator(ClassViewPart *parent, const char *name) m_state = GoToDefinitions; m_navNoDefinition = true; - m_actionSyncWithEditor = new KAction( i18n("Sync ClassView"), "view_tree", KShortcut(), this, + m_actionSyncWithEditor = new TDEAction( i18n("Sync ClassView"), "view_tree", TDEShortcut(), this, TQT_SLOT(slotSyncWithEditor()), m_part->actionCollection(), "classview_sync_with_editor" ); - KAction * action = new KAction( i18n("Jump to next function"), CTRL+ALT+Key_PageDown, this, + TDEAction * action = new TDEAction( i18n("Jump to next function"), CTRL+ALT+Key_PageDown, this, TQT_SLOT(slotJumpToNextFunction()), m_part->actionCollection(), "navigator_jump_to_next_function" ); action->plug( &m_dummyActionWidget ); - action = new KAction( i18n("Jump to previous function"), CTRL+ALT+Key_PageUp, this, + action = new TDEAction( i18n("Jump to previous function"), CTRL+ALT+Key_PageUp, this, TQT_SLOT(slotJumpToPreviousFunction()), m_part->actionCollection(), "navigator_jump_to_previous_function" ); action->plug( &m_dummyActionWidget ); diff --git a/parts/classview/navigator.h b/parts/classview/navigator.h index 6444f8a6..ed0c3ffb 100644 --- a/parts/classview/navigator.h +++ b/parts/classview/navigator.h @@ -29,7 +29,7 @@ class TextPaintStyleStore; class TQTimer; class ClassViewPart; class TQListViewItem; -class KAction; +class TDEAction; #define NAV_NODEFINITION "(no function)" @@ -79,7 +79,7 @@ private: NavigationState m_state; TQWidget m_dummyActionWidget; - KAction* m_actionSyncWithEditor; + TDEAction* m_actionSyncWithEditor; bool m_navNoDefinition; diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 0f4f7b5c..e5b48dba 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -88,11 +88,11 @@ CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - new KAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, TQT_SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut"); - new KAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, TQT_SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut"); - new KAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, TQT_SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut"); - new KAction( i18n("Jump to Next Match"), 0, 0, this, TQT_SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next"); - new KAction( i18n("Open Lookup Dialog"), 0, 0, this, TQT_SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut"); + new TDEAction( i18n("Lookup Current Text"), 0, CTRL+Key_Underscore, this, TQT_SLOT(slotLookup()), actionCollection(), "ctags_lookup_shortcut"); + new TDEAction( i18n("Lookup Current Text as Declaration"), 0, CTRL+Key_Semicolon, this, TQT_SLOT(slotLookupDeclaration()), actionCollection(), "ctags_declaration_shortcut"); + new TDEAction( i18n("Lookup Current Text as Definition"), 0, CTRL+Key_Colon, this, TQT_SLOT(slotLookupDefinition()), actionCollection(), "ctags_definition_shortcut"); + new TDEAction( i18n("Jump to Next Match"), 0, 0, this, TQT_SLOT(slotGoToNext()), actionCollection(), "ctags_jump_to_next"); + new TDEAction( i18n("Open Lookup Dialog"), 0, 0, this, TQT_SLOT(slotOpenLookup()), actionCollection(), "ctags_input_shortcut"); } diff --git a/parts/ctags2/ctags2_settingswidgetbase.ui b/parts/ctags2/ctags2_settingswidgetbase.ui index c96d04a2..275c1e4b 100644 --- a/parts/ctags2/ctags2_settingswidgetbase.ui +++ b/parts/ctags2/ctags2_settingswidgetbase.ui @@ -297,7 +297,7 @@ </size> </property> </spacer> - <widget class="KListView" row="2" column="0" rowspan="2" colspan="1"> + <widget class="TDEListView" row="2" column="0" rowspan="2" colspan="1"> <column> <property name="text"> <string>Name</string> diff --git a/parts/ctags2/ctags2_widgetbase.ui b/parts/ctags2/ctags2_widgetbase.ui index 0d0b0d6c..0218e21b 100644 --- a/parts/ctags2/ctags2_widgetbase.ui +++ b/parts/ctags2/ctags2_widgetbase.ui @@ -22,7 +22,7 @@ <property name="margin"> <number>2</number> </property> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Tag</string> diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index 4d36bd17..14ce5d0d 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -57,7 +57,7 @@ DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) mainWindow()->embedOutputView( diffWidget, nm, i18n("Output of the diff command") ); mainWindow()->setViewAvailable( diffWidget, false ); - KAction *action = new KAction( i18n("Difference Viewer..."), 0, + TDEAction *action = new TDEAction( i18n("Difference Viewer..."), 0, this, TQT_SLOT(slotExecDiff()), actionCollection(), "tools_diff" ); action->setToolTip(i18n("Difference viewer")); diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp index 77e69705..b6e86da0 100644 --- a/parts/distpart/distpart_part.cpp +++ b/parts/distpart/distpart_part.cpp @@ -45,7 +45,7 @@ DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringLis setXMLFile("kdevpart_distpart.rc"); - m_action = new KAction( i18n("Distribution && Publishing"), "package", 0, + m_action = new TDEAction( i18n("Distribution && Publishing"), "package", 0, this, TQT_SLOT(show()), actionCollection(), "make_dist" ); diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h index de89c18d..4b907353 100644 --- a/parts/distpart/distpart_part.h +++ b/parts/distpart/distpart_part.h @@ -48,7 +48,7 @@ public slots: private: packageBase *RpmPackage, *LsmPackage; TQGuardedPtr<DistpartDialog> m_dialog; - KAction *m_action; + TDEAction *m_action; TQGuardedPtr<KDialogBase> m_dlg; }; diff --git a/parts/distpart/distpart_ui.ui b/parts/distpart/distpart_ui.ui index 6182100f..3eec55e6 100644 --- a/parts/distpart/distpart_ui.ui +++ b/parts/distpart/distpart_ui.ui @@ -138,7 +138,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListBox" row="1" column="1" rowspan="2" colspan="1"> + <widget class="TDEListBox" row="1" column="1" rowspan="2" colspan="1"> <property name="name"> <cstring>srcDistFileListBox</cstring> </property> @@ -942,7 +942,7 @@ Build Files</string> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListBox" row="1" column="1"> + <widget class="TDEListBox" row="1" column="1"> <property name="name"> <cstring>uploadFileListBox</cstring> </property> diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index 4581361d..5cf527ab 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -84,11 +84,11 @@ TQString DocBookmarkOwner::currentTitle() const class DocBookmarkItem: public DocumentationItem { public: - DocBookmarkItem(Type type, KListView *parent, const TQString &name) + DocBookmarkItem(Type type, TDEListView *parent, const TQString &name) :DocumentationItem(type, parent, name) { } - DocBookmarkItem(Type type, KListView *parent, DocumentationItem *after, const TQString &name) + DocBookmarkItem(Type type, TDEListView *parent, DocumentationItem *after, const TQString &name) :DocumentationItem(type, parent, after, name) { } @@ -114,7 +114,7 @@ BookmarkView::BookmarkView(DocumentationWidget *parent, const char *name) m_bmOwner = new DocBookmarkOwner(m_widget->part()); TQVBoxLayout *l = new TQVBoxLayout(this, 0, KDialog::spacingHint()); - m_view = new KListView(this); + m_view = new TDEListView(this); m_view->addColumn(i18n("Title")); m_view->setSorting(-1); m_view->header()->hide(); @@ -215,7 +215,7 @@ void BookmarkView::addBookmark() TQString title = m_bmOwner->currentTitle(); TQString url = m_bmOwner->currentURL(); - KPopupMenu menu; + TDEPopupMenu menu; bool useMenu = false; if (!title.isEmpty() && !url.isEmpty()) { diff --git a/parts/documentation/bookmarkview.h b/parts/documentation/bookmarkview.h index c2877607..36283e0c 100644 --- a/parts/documentation/bookmarkview.h +++ b/parts/documentation/bookmarkview.h @@ -24,7 +24,7 @@ #include <kbookmarkmanager.h> -class KListView; +class TDEListView; class KPushButton; class DocumentationPart; class DocumentationWidget; @@ -71,7 +71,7 @@ protected slots: private: DocumentationWidget *m_widget; - KListView *m_view; + TDEListView *m_view; KPushButton *m_addButton; KPushButton *m_editButton; KPushButton *m_removeButton; diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index 2581f5a0..42b4be64 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -37,7 +37,7 @@ ContentsView::ContentsView(DocumentationWidget *parent, const char *name) :TQWidget(parent, name), m_widget(parent) { TQVBoxLayout *cl = new TQVBoxLayout(this, 0, 0); - m_view = new KListView(this); + m_view = new TDEListView(this); cl->addWidget(m_view); m_view->addColumn(i18n( "Contents" )); diff --git a/parts/documentation/contentsview.h b/parts/documentation/contentsview.h index 9ba4c743..e170b7dc 100644 --- a/parts/documentation/contentsview.h +++ b/parts/documentation/contentsview.h @@ -25,7 +25,7 @@ class FindDocumentation; class DocumentationWidget; class TQListViewItem; -class KListView; +class TDEListView; class ContentsView : public TQWidget { @@ -35,7 +35,7 @@ public: ContentsView(DocumentationWidget *parent, const char *name = 0); ~ContentsView(); - KListView *view() const { return m_view; } + TDEListView *view() const { return m_view; } protected slots: void itemExecuted(TQListViewItem *item, const TQPoint &p, int col); @@ -46,7 +46,7 @@ protected: private: DocumentationWidget *m_widget; - KListView *m_view; + TDEListView *m_view; friend class FindDocumentation; }; diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp index b8d6071c..055daeb5 100644 --- a/parts/documentation/docconfiglistview.cpp +++ b/parts/documentation/docconfiglistview.cpp @@ -24,7 +24,7 @@ #include "kdevdocumentationplugin.h" DocConfigListView::DocConfigListView(TQWidget *parent, const char *name) - :KListView(parent, name) + :TDEListView(parent, name) { // setSorting(-1); addColumn(i18n("TOC")); diff --git a/parts/documentation/docconfiglistview.h b/parts/documentation/docconfiglistview.h index d2082a60..474655b0 100644 --- a/parts/documentation/docconfiglistview.h +++ b/parts/documentation/docconfiglistview.h @@ -22,7 +22,7 @@ #include <klistview.h> -class DocConfigListView : public KListView +class DocConfigListView : public TDEListView { Q_OBJECT diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 5cea1004..df41666b 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -157,7 +157,7 @@ void DocGlobalConfigWidget::addCollectionButtonClicked() } } -KListView *DocGlobalConfigWidget::activeView() +TDEListView *DocGlobalConfigWidget::activeView() { return m_View; } diff --git a/parts/documentation/docglobalconfigwidget.h b/parts/documentation/docglobalconfigwidget.h index 65be086e..c2d08a37 100644 --- a/parts/documentation/docglobalconfigwidget.h +++ b/parts/documentation/docglobalconfigwidget.h @@ -27,7 +27,7 @@ class DocumentationPart; class DocumentationWidget; class DocumentationPlugin; -class KListView; +class TDEListView; class DocGlobalConfigWidget : public DocGlobalConfigWidgetBase { @@ -51,7 +51,7 @@ public slots: protected: /*$PROTECTED_FUNCTIONS$*/ - KListView *activeView(); + TDEListView *activeView(); void updateConfigForHTMLParts(); protected slots: @@ -61,7 +61,7 @@ private: DocumentationPart *m_part; DocumentationWidget *m_widget; - KListView * m_View; + TDEListView * m_View; }; #endif diff --git a/parts/documentation/docglobalconfigwidgetbase.ui b/parts/documentation/docglobalconfigwidgetbase.ui index 5efa3b92..12c4de1a 100644 --- a/parts/documentation/docglobalconfigwidgetbase.ui +++ b/parts/documentation/docglobalconfigwidgetbase.ui @@ -363,12 +363,12 @@ <cstring>standardFont_combo</cstring> </property> </widget> - <widget class="KFontCombo" row="0" column="1"> + <widget class="TDEFontCombo" row="0" column="1"> <property name="name"> <cstring>standardFont_combo</cstring> </property> </widget> - <widget class="KFontCombo" row="1" column="1"> + <widget class="TDEFontCombo" row="1" column="1"> <property name="name"> <cstring>fixedFont_combo</cstring> </property> diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 71054460..e618c2a3 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -204,12 +204,12 @@ bool DocumentationPart::configure(int page) void DocumentationPart::setupActions() { -/* KActionMenu *menu = new KActionMenu(i18n("&Bookmarks"), actionCollection(), "doc_bookmarks"); +/* TDEActionMenu *menu = new TDEActionMenu(i18n("&Bookmarks"), actionCollection(), "doc_bookmarks"); KBookmarkMenu *bm = new KBookmarkMenu(new DocBookmarkManager(this), new DocBookmarkOwner(this), menu->popupMenu(), actionCollection(), true);*/ - KAction *action; + TDEAction *action; - action = new KAction(i18n("&Search in Documentation..."), CTRL+ALT+Key_S, + action = new TDEAction(i18n("&Search in Documentation..."), CTRL+ALT+Key_S, this, TQT_SLOT(searchInDocumentation()), actionCollection(), "help_search_in_doc" ); action->setToolTip(i18n("Full text search in the documentation")); @@ -220,7 +220,7 @@ void DocumentationPart::setupActions() "full text index must be created first, which can be done in the " "configuration dialog of the documentation plugin.")); - action = new KAction(i18n("&Look in Documentation Index..."), CTRL+ALT+Key_I, + action = new TDEAction(i18n("&Look in Documentation Index..."), CTRL+ALT+Key_I, this, TQT_SLOT(lookInDocumentationIndex()), actionCollection(), "help_look_in_index" ); action->setToolTip(i18n("Look in the documentation index")); @@ -229,19 +229,19 @@ void DocumentationPart::setupActions() "a term to be entered which will be looked for in " "the documentation index.")); - action = new KAction(i18n("Man Page..."), 0, + action = new TDEAction(i18n("Man Page..."), 0, this, TQT_SLOT(manPage()), actionCollection(), "help_manpage" ); action->setToolTip(i18n("Show a manpage")); action->setWhatsThis(i18n("<b>Show a manpage</b><p>Opens a man page using embedded viewer.")); - action = new KAction(i18n("Info Page..."), 0, + action = new TDEAction(i18n("Info Page..."), 0, this, TQT_SLOT(infoPage()), actionCollection(), "help_infopage"); action->setToolTip(i18n("Show an infopage")); action->setWhatsThis(i18n("<b>Show an infopage</b><p>Opens an info page using embedded viewer.")); - action = new KAction(i18n("Find Documentation..."), 0, + action = new TDEAction(i18n("Find Documentation..."), 0, this, TQT_SLOT(findInDocumentation()), actionCollection(), "help_find_documentation"); action->setToolTip(i18n("Find Documentation")); diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index e7bbc6c3..c591d84e 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -134,7 +134,7 @@ void DocumentationWidget::focusInEvent(TQFocusEvent */*e*/) m_tab->currentItem()->setFocus(); } -KListView * DocumentationWidget::contents( ) const +TDEListView * DocumentationWidget::contents( ) const { return m_contents->view(); } diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h index ecb1e473..a813b393 100644 --- a/parts/documentation/documentation_widget.h +++ b/parts/documentation/documentation_widget.h @@ -32,7 +32,7 @@ class TQToolBox; class IndexBox; class SearchView; class BookmarkView; -class KListView; +class TDEListView; class DocumentationWidget : public TQWidget { @@ -44,7 +44,7 @@ public: DocumentationPart *part() const { return m_part; } - KListView *contents() const; + TDEListView *contents() const; IndexBox *index() const; public slots: diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp index 79fa9915..12fb1dd1 100644 --- a/parts/documentation/docutils.cpp +++ b/parts/documentation/docutils.cpp @@ -75,7 +75,7 @@ void DocUtils::docItemPopup(DocumentationPart *part, IndexItem *docItem, const T void DocUtils::docItemPopup(DocumentationPart *part, const TQString &title, const KURL &url, const TQPoint &pos, bool showBookmark, bool showSearch) { - KPopupMenu menu; + TDEPopupMenu menu; menu.insertTitle(i18n("Documentation")); menu.insertItem(i18n("Open in Current Tab"), 1); menu.insertItem(i18n("Open in New Tab"), 2); diff --git a/parts/documentation/docutils.h b/parts/documentation/docutils.h index dd19c936..a10c4e36 100644 --- a/parts/documentation/docutils.h +++ b/parts/documentation/docutils.h @@ -23,7 +23,7 @@ #include <tqstring.h> class KURLRequester; -class KPopupMenu; +class TDEPopupMenu; class DocumentationItem; class DocumentationPart; class TQPoint; diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index e5068635..9e97ecce 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -157,7 +157,7 @@ void FindDocumentation::procManReadStdout( TDEProcess*, char* buf, int len) void FindDocumentation::searchInInfo() { - info_item = new KListViewItem(result_list, last_item, "Info"); + info_item = new TDEListViewItem(result_list, last_item, "Info"); info_item->setOpen(true); last_item = info_item; @@ -175,7 +175,7 @@ void FindDocumentation::searchInInfo() void FindDocumentation::searchInMan() { - man_item = new KListViewItem( result_list, last_item, i18n("Manual") ); + man_item = new TDEListViewItem( result_list, last_item, i18n("Manual") ); man_item->setOpen(true); last_item = man_item; @@ -194,7 +194,7 @@ void FindDocumentation::searchInMan() void FindDocumentation::searchInGoogle() { - google_item = new KListViewItem(result_list, last_item, "Google"); + google_item = new TDEListViewItem(result_list, last_item, "Google"); google_item->setOpen(true); last_item = google_item; @@ -213,7 +213,7 @@ void FindDocumentation::searchInGoogle() void FindDocumentation::searchInContents() { - contents_item = new KListViewItem( result_list, last_item, i18n("Contents") ); + contents_item = new TDEListViewItem( result_list, last_item, i18n("Contents") ); contents_item->setOpen(true); last_item = contents_item; @@ -246,7 +246,7 @@ void FindDocumentation::searchInContents() void FindDocumentation::searchInIndex() { - index_item =new KListViewItem(result_list, last_item , "Index"); + index_item =new TDEListViewItem(result_list, last_item , "Index"); index_item->setOpen(true); last_item = index_item; diff --git a/parts/documentation/find_documentation.h b/parts/documentation/find_documentation.h index 28d867c3..b1fb6f05 100644 --- a/parts/documentation/find_documentation.h +++ b/parts/documentation/find_documentation.h @@ -26,7 +26,7 @@ #include "find_documentationbase.h" class DocumentationWidget; -class KListViewItem; +class TDEListViewItem; class FindDocumentationOptions; class TDEProcess; @@ -68,12 +68,12 @@ private: TDEProcess* proc_info; TQString proc_man_out; TQString proc_info_out; - KListViewItem* man_item; - KListViewItem* info_item; - KListViewItem* index_item; - KListViewItem* google_item; - KListViewItem* contents_item; - KListViewItem* last_item; + TDEListViewItem* man_item; + TDEListViewItem* info_item; + TDEListViewItem* index_item; + TDEListViewItem* google_item; + TDEListViewItem* contents_item; + TDEListViewItem* last_item; DocumentationWidget* m_widget; FindDocumentationOptions* m_options; bool first_match_found; diff --git a/parts/documentation/find_documentationbase.ui b/parts/documentation/find_documentationbase.ui index 455bb860..cae5096a 100644 --- a/parts/documentation/find_documentationbase.ui +++ b/parts/documentation/find_documentationbase.ui @@ -77,7 +77,7 @@ </size> </property> </spacer> - <widget class="KListView" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TDEListView" row="2" column="0" rowspan="1" colspan="3"> <column> <property name="text"> <string></string> diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp index 6c6805e1..5aee560e 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -33,30 +33,30 @@ //class DocumentationItem -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, TDEListView *parent, const TQString &name) - :KListViewItem(parent, name), m_type(type) + :TDEListViewItem(parent, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem *parent, +DocumentationItem::DocumentationItem(DocumentationItem::Type type, TDEListViewItem *parent, const TQString &name) - :KListViewItem(parent, name), m_type(type) + :TDEListViewItem(parent, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListView *parent, - KListViewItem *after, const TQString &name) - :KListViewItem(parent, after, name), m_type(type) +DocumentationItem::DocumentationItem(DocumentationItem::Type type, TDEListView *parent, + TDEListViewItem *after, const TQString &name) + :TDEListViewItem(parent, after, name), m_type(type) { init(); } -DocumentationItem::DocumentationItem(DocumentationItem::Type type, KListViewItem * parent, - KListViewItem * after, const TQString & name ) - :KListViewItem(parent, after, name), m_type(type) +DocumentationItem::DocumentationItem(DocumentationItem::Type type, TDEListViewItem * parent, + TDEListViewItem * after, const TQString & name ) + :TDEListViewItem(parent, after, name), m_type(type) { init(); } @@ -90,7 +90,7 @@ void DocumentationItem::init( ) DocumentationCatalogItem::DocumentationCatalogItem(DocumentationPlugin* plugin, - KListView *parent, const TQString &name) + TDEListView *parent, const TQString &name) :DocumentationItem(DocumentationItem::Catalog, parent, name), m_plugin(plugin), isLoaded(false), isActivated(false), m_isProjectDocumentationItem(false) { @@ -400,7 +400,7 @@ void DocumentationPlugin::addCatalog(DocumentationCatalogItem *item) // indexes[item] = TQValueList<IndexItem*>(); } -void DocumentationPlugin::addCatalogConfiguration(KListView *configurationView, +void DocumentationPlugin::addCatalogConfiguration(TDEListView *configurationView, const TQString &title, const TQString &url) { new ConfigurationItem(configurationView, this, title, url, @@ -440,7 +440,7 @@ void DocumentationPlugin::loadIndex(IndexBox *index, DocumentationCatalogItem *i cacheIndex(item); } -void DocumentationPlugin::init(KListView *contents) +void DocumentationPlugin::init(TDEListView *contents) { config->setGroup("Locations"); TQMap<TQString, TQString> entryMap = config->entryMap("Locations"); @@ -453,7 +453,7 @@ void DocumentationPlugin::init(KListView *contents) } } -void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringList restrictions) +void DocumentationPlugin::reinit(TDEListView *contents, IndexBox *index, TQStringList restrictions) { config->setGroup("Locations"); TQMap<TQString, TQString> entryMap = config->entryMap("Locations"); @@ -504,7 +504,7 @@ void DocumentationPlugin::reinit(KListView *contents, IndexBox *index, TQStringL } } -void DocumentationPlugin::loadCatalogConfiguration(KListView *configurationView) +void DocumentationPlugin::loadCatalogConfiguration(TDEListView *configurationView) { config->setGroup("Locations"); TQMap<TQString, TQString> entryMap = config->entryMap("Locations"); @@ -529,7 +529,7 @@ void DocumentationPlugin::loadCatalogConfiguration(KListView *configurationView) } } -void DocumentationPlugin::saveCatalogConfiguration(KListView *configurationView) +void DocumentationPlugin::saveCatalogConfiguration(TDEListView *configurationView) { config->setGroup("Locations"); @@ -614,7 +614,7 @@ void DocumentationPlugin::setCatalogEnabled(const TQString &name, bool e) //class IndexBox IndexBox::IndexBox(TQWidget *parent, const char *name) - :KListBox(parent, name), m_dirty(false) + :TDEListBox(parent, name), m_dirty(false) { } @@ -676,7 +676,7 @@ ProjectDocumentationPlugin::~ProjectDocumentationPlugin() deinit(); } -void ProjectDocumentationPlugin::init(KListView *contents, IndexBox *index, const TQString &url) +void ProjectDocumentationPlugin::init(TDEListView *contents, IndexBox *index, const TQString &url) { m_contents = contents; m_index = index; diff --git a/parts/documentation/interfaces/kdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h index 9c61e208..e5e71ca2 100644 --- a/parts/documentation/interfaces/kdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -32,7 +32,7 @@ /**Documentation list item. Stores the type of a documentation it represents and an URL.*/ -class DocumentationItem: public KListViewItem +class DocumentationItem: public TDEListViewItem { public: /**Type of documentation which is represented by this item.*/ @@ -43,10 +43,10 @@ public: Document /**<Document.*/ }; - DocumentationItem(Type type, KListView *parent, const TQString &name); - DocumentationItem(Type type, KListView *parent, KListViewItem *after, const TQString &name); - DocumentationItem(Type type, KListViewItem *parent, const TQString &name); - DocumentationItem(Type type, KListViewItem *parent, KListViewItem *after, const TQString &name); + DocumentationItem(Type type, TDEListView *parent, const TQString &name); + DocumentationItem(Type type, TDEListView *parent, TDEListViewItem *after, const TQString &name); + DocumentationItem(Type type, TDEListViewItem *parent, const TQString &name); + DocumentationItem(Type type, TDEListViewItem *parent, TDEListViewItem *after, const TQString &name); virtual void setURL(const KURL &url) { m_url = url; } virtual KURL url() const { return m_url; } @@ -72,7 +72,7 @@ class DocumentationPlugin; class DocumentationCatalogItem: public DocumentationItem { public: - DocumentationCatalogItem(DocumentationPlugin* plugin, KListView *parent, const TQString &name); + DocumentationCatalogItem(DocumentationPlugin* plugin, TDEListView *parent, const TQString &name); DocumentationCatalogItem(DocumentationPlugin* plugin, DocumentationItem *parent, const TQString &name); virtual ~DocumentationCatalogItem(); @@ -134,7 +134,7 @@ private: }; /**Documentation index view.*/ -class IndexBox: public KListBox{ +class IndexBox: public TDEListBox{ public: IndexBox(TQWidget *parent = 0, const char *name = 0); @@ -241,19 +241,19 @@ public: virtual TQString pluginName() const = 0; /**Creates documentation catalog with given title and url.*/ - virtual DocumentationCatalogItem *createCatalog(KListView *contents, const TQString &title, const TQString &url) = 0; + virtual DocumentationCatalogItem *createCatalog(TDEListView *contents, const TQString &title, const TQString &url) = 0; /**Initialize a list of catalogs. @param contents the listview to fill with catalogs */ - virtual void init(KListView *contents); + virtual void init(TDEListView *contents); /**Reloads a list of catalogs. This method should add missing catalogs to the view, update index for added catalogs and also delete restricted catalogs. @param contents the listview to fill with catalogs @param index the listbox with index to update @param restrictions the list of catalogs names to remove */ - virtual void reinit(KListView *contents, IndexBox *index, TQStringList restrictions); + virtual void reinit(TDEListView *contents, IndexBox *index, TQStringList restrictions); /**Initializes plugin configuration. Documentation plugins should be able to initialize the default configuration on startup without any user interaction. Call this in the constructor of your plugin.*/ @@ -296,13 +296,13 @@ public: virtual TQStringList fullTextSearchLocations() = 0; /**Loads catalog configuration and fills configurationView with ConfigurationItem objects.*/ - virtual void loadCatalogConfiguration(KListView *configurationView); + virtual void loadCatalogConfiguration(TDEListView *configurationView); /**Saves catalog configuration basing on configurationView and deletedConfigurationItems contents. If you use TDEConfig to store configuration, it is important that you call TDEConfig::sync() method after saving.*/ - virtual void saveCatalogConfiguration(KListView *configurationView); + virtual void saveCatalogConfiguration(TDEListView *configurationView); /**Adds new catalog to a configuration.*/ - virtual void addCatalogConfiguration(KListView *configurationView, + virtual void addCatalogConfiguration(TDEListView *configurationView, const TQString &title, const TQString &url); /**Edits catalog configuration.*/ virtual void editCatalogConfiguration(ConfigurationItem *configurationItem, @@ -396,7 +396,7 @@ public: virtual ~ProjectDocumentationPlugin(); /**Initializes project documentation plugin - creates documentation catalog.*/ - virtual void init(KListView *contents, IndexBox *index, const TQString &url); + virtual void init(TDEListView *contents, IndexBox *index, const TQString &url); /**Deinitializes project documentation plugin - removes documentation catalog.*/ virtual void deinit(); @@ -415,7 +415,7 @@ private: DocumentationPlugin::ProjectDocType m_type; class KDirWatch *m_watch; - class KListView *m_contents; + class TDEListView *m_contents; class IndexBox *m_index; TQString m_url; }; diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index e17ec86b..be624209 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -51,7 +51,7 @@ DocCHMPlugin::~DocCHMPlugin() } -DocumentationCatalogItem* DocCHMPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) +DocumentationCatalogItem* DocCHMPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url) { DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title); item->setURL(KURL(url)); @@ -127,12 +127,12 @@ void DocCHMPlugin::createIndex(IndexBox* // index } -static KListViewItem* chainEnd(KListViewItem *parent) { +static TDEListViewItem* chainEnd(TDEListViewItem *parent) { if(parent == 0) return 0; - KListViewItem* ret = dynamic_cast<KListViewItem*>(parent->firstChild()); + TDEListViewItem* ret = dynamic_cast<TDEListViewItem*>(parent->firstChild()); if(ret == 0) return 0; while(ret->nextSibling() != 0) { - ret = dynamic_cast<KListViewItem*>(ret->nextSibling()); + ret = dynamic_cast<TDEListViewItem*>(ret->nextSibling()); } return ret; } diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h index 7caf3b58..452e1c09 100644 --- a/parts/documentation/plugins/chm/docchmplugin.h +++ b/parts/documentation/plugins/chm/docchmplugin.h @@ -35,7 +35,7 @@ public: virtual void setCatalogURL(DocumentationCatalogItem* item); virtual TQString catalogTitle(const TQString& url); virtual TQPair<KFile::Mode, TQString> catalogLocatorProps(); - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); + virtual DocumentationCatalogItem* createCatalog(TDEListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item); diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp index cbf966a6..bc6488bf 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.cpp +++ b/parts/documentation/plugins/custom/doccustomplugin.cpp @@ -55,7 +55,7 @@ TQString DocCustomPlugin::pluginName() const return i18n("Custom Documentation Collection"); } -DocumentationCatalogItem* DocCustomPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) +DocumentationCatalogItem* DocCustomPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url) { DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title); item->setURL(KURL(url)); diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h index cabd2554..f83daf1a 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.h +++ b/parts/documentation/plugins/custom/doccustomplugin.h @@ -29,7 +29,7 @@ public: virtual TQString pluginName() const; - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); + virtual DocumentationCatalogItem* createCatalog(TDEListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp index d794f2a3..c3865940 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -41,7 +41,7 @@ class DevHelpDocumentationCatalogItem: public DocumentationCatalogItem { public: DevHelpDocumentationCatalogItem(const TQString &devHelpFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) + TDEListView *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_devHelpFile(devHelpFile) { } @@ -85,7 +85,7 @@ DocDevHelpPlugin::~DocDevHelpPlugin() { } -DocumentationCatalogItem* DocDevHelpPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) +DocumentationCatalogItem* DocDevHelpPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url) { return new DevHelpDocumentationCatalogItem(url, this, contents, title); } diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h index e49fd198..6436a1d8 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h @@ -40,7 +40,7 @@ public: virtual void createTOC(DocumentationCatalogItem* item); - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); + virtual DocumentationCatalogItem* createCatalog(TDEListView* contents, const TQString& title, const TQString& url); virtual bool needRefreshIndex(DocumentationCatalogItem* item); virtual void createIndex(IndexBox* index, DocumentationCatalogItem* item); diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp index c156a085..7cb92879 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp +++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp @@ -52,7 +52,7 @@ TQString DocDjvuPlugin::pluginName() const return i18n("Djvu Documentation Collection"); } -DocumentationCatalogItem* DocDjvuPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) +DocumentationCatalogItem* DocDjvuPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url) { DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title); item->setURL(KURL(url)); diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h index 4dda28fc..6bff409c 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.h +++ b/parts/documentation/plugins/djvu/docdjvuplugin.h @@ -29,7 +29,7 @@ public: virtual TQString pluginName() const; - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); + virtual DocumentationCatalogItem* createCatalog(TDEListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp index 13cee5d0..3309622e 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp @@ -44,7 +44,7 @@ class DoxyDocumentationCatalogItem: public DocumentationCatalogItem { public: DoxyDocumentationCatalogItem(const TQString &origUrl, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) + TDEListView *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_origUrl(origUrl) { } @@ -328,7 +328,7 @@ void DocDoxygenPlugin::createTOC(DocumentationCatalogItem* item) } while (!dirStack.isEmpty()); } -DocumentationCatalogItem *DocDoxygenPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url) +DocumentationCatalogItem *DocDoxygenPlugin::createCatalog(TDEListView *contents, const TQString &title, const TQString &url) { kdDebug() << "DocDoxygenPlugin::createCatalog: url=" << url << endl; DocumentationCatalogItem *item = new DoxyDocumentationCatalogItem(url, this, contents, title); diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h index b38bf406..ebd4a540 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h @@ -35,7 +35,7 @@ public: virtual TQString pluginName() const; - virtual DocumentationCatalogItem *createCatalog(KListView *contents, const TQString &title, const TQString &url); + virtual DocumentationCatalogItem *createCatalog(TDEListView *contents, const TQString &title, const TQString &url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index 681fdbba..cf0676a2 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -43,7 +43,7 @@ class TOCDocumentationCatalogItem: public DocumentationCatalogItem { public: TOCDocumentationCatalogItem(const TQString &tocFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) + TDEListView *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_tocFile(tocFile) { } @@ -80,7 +80,7 @@ TQString DocKDevTOCPlugin::pluginName() const return i18n("TDevelopTOC Documentation Collection"); } -DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) +DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url) { return new TOCDocumentationCatalogItem(url, this, contents, title); } diff --git a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h index 43e475ee..7205cc4c 100644 --- a/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h @@ -35,7 +35,7 @@ public: virtual TQString pluginName() const; virtual TQString catalogTitle(const TQString& url); - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); + virtual DocumentationCatalogItem* createCatalog(TDEListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp index 06692f6c..8ad1dc43 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.cpp +++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp @@ -52,7 +52,7 @@ TQString DocPDBPlugin::pluginName() const return i18n("PalmDoc Documentation Collection"); } -DocumentationCatalogItem* DocPDBPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) +DocumentationCatalogItem* DocPDBPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url) { DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title); item->setURL(KURL(url)); diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h index 5fb85cdd..40dd3a15 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.h +++ b/parts/documentation/plugins/pdb/docpdbplugin.h @@ -29,7 +29,7 @@ public: virtual TQString pluginName() const; - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); + virtual DocumentationCatalogItem* createCatalog(TDEListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp index 9bc4285a..0e1373a0 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.cpp +++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp @@ -52,7 +52,7 @@ TQString DocPDFPlugin::pluginName() const return i18n("PDF Documentation Collection"); } -DocumentationCatalogItem* DocPDFPlugin::createCatalog(KListView* contents, const TQString& title, const TQString& url) +DocumentationCatalogItem* DocPDFPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url) { DocumentationCatalogItem *item = new DocumentationCatalogItem(this, contents, title); item->setURL(KURL(url)); diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h index 0d97101b..d5ecc7eb 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.h +++ b/parts/documentation/plugins/pdf/docpdfplugin.h @@ -29,7 +29,7 @@ public: virtual TQString pluginName() const; - virtual DocumentationCatalogItem* createCatalog(KListView* contents, const TQString& title, const TQString& url); + virtual DocumentationCatalogItem* createCatalog(TDEListView* contents, const TQString& title, const TQString& url); virtual void createTOC(DocumentationCatalogItem* item); virtual void setCatalogURL(DocumentationCatalogItem* item); diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp index 19017d96..69a52a64 100644 --- a/parts/documentation/plugins/qt/docqtplugin.cpp +++ b/parts/documentation/plugins/qt/docqtplugin.cpp @@ -41,7 +41,7 @@ class TQtDocumentationCatalogItem: public DocumentationCatalogItem { public: TQtDocumentationCatalogItem(const TQString &dcfFile, DocumentationPlugin* plugin, - KListView *parent, const TQString &name) + TDEListView *parent, const TQString &name) :DocumentationCatalogItem(plugin, parent, name), m_dcfFile(dcfFile) { } @@ -331,7 +331,7 @@ TQString DocQtPlugin::catalogTitle(const TQString &url) return docEl.attribute("title", TQString()); } -DocumentationCatalogItem *DocQtPlugin::createCatalog(KListView *contents, const TQString &title, const TQString &url) +DocumentationCatalogItem *DocQtPlugin::createCatalog(TDEListView *contents, const TQString &title, const TQString &url) { return new TQtDocumentationCatalogItem(url, this, contents, title); } diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h index 53dd6740..8eac8456 100644 --- a/parts/documentation/plugins/qt/docqtplugin.h +++ b/parts/documentation/plugins/qt/docqtplugin.h @@ -35,7 +35,7 @@ public: virtual TQString pluginName() const; - virtual DocumentationCatalogItem *createCatalog(KListView *contents, const TQString &title, const TQString &url); + virtual DocumentationCatalogItem *createCatalog(TDEListView *contents, const TQString &title, const TQString &url); virtual void createTOC(DocumentationCatalogItem *item); virtual void setCatalogURL(DocumentationCatalogItem *item); diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 28e3a2eb..47131b03 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -80,7 +80,7 @@ SearchView::SearchView(DocumentationPart *part, TQWidget *parent, const char *na l3->addWidget(m_sortMethodBox, 1, 1); TQVBoxLayout *l4 = new TQVBoxLayout(l, 0); - m_view = new KListView(this); + m_view = new TDEListView(this); TQLabel *vLabel = new TQLabel(m_view, i18n("Search &results:"), this); l4->addWidget(vLabel); l4->addWidget(m_view); diff --git a/parts/documentation/searchview.h b/parts/documentation/searchview.h index cf7062c7..7c3602c1 100644 --- a/parts/documentation/searchview.h +++ b/parts/documentation/searchview.h @@ -25,7 +25,7 @@ class DocumentationPart; class KLineEdit; class KComboBox; -class KListView; +class TDEListView; class KPushButton; class TDEProcess; class TQListViewItem; @@ -65,7 +65,7 @@ private: KLineEdit *m_edit; KComboBox *m_searchMethodBox; KComboBox *m_sortMethodBox; - KListView *m_view; + TDEListView *m_view; KPushButton *m_configButton; KPushButton *m_indexButton; KPushButton *m_goSearchButton; diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index 50c916f2..b238f99c 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -57,15 +57,15 @@ DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList setInstance(DoxygenFactory::instance()); setXMLFile("kdevdoxygen.rc"); - KAction *action; - action = new KAction( i18n("Build API Documentation"), 0, + TDEAction *action; + action = new TDEAction( i18n("Build API Documentation"), 0, this, TQT_SLOT(slotDoxygen()), actionCollection(), "build_doxygen" ); action->setToolTip(i18n("Build API documentation")); action->setWhatsThis(i18n("<b>Build API documentation</b><p>Runs doxygen on a project Doxyfile to generate API documentation. " "If the search engine is enabled in Doxyfile, this also runs doxytag to create it.")); - action = new KAction( i18n("Clean API Documentation"), 0, + action = new TDEAction( i18n("Clean API Documentation"), 0, this, TQT_SLOT(slotDoxClean()), actionCollection(), "clean_doxygen" ); action->setToolTip(i18n("Clean API documentation")); @@ -78,13 +78,13 @@ DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList connect( _configProxy, TQT_SIGNAL(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )), this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - m_actionDocumentFunction = new KAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, TQT_SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function"); + m_actionDocumentFunction = new TDEAction(i18n("Document Current Function"), 0, CTRL+SHIFT+Key_S, this, TQT_SLOT(slotDocumentFunction()), actionCollection(), "edit_document_function"); m_actionDocumentFunction->setToolTip( i18n("Create a documentation template above a function")); m_actionDocumentFunction->setWhatsThis(i18n("<b>Document Current Function</b><p>Creates a documentation template according to a function's signature above a function definition/declaration.")); m_tmpDir.setAutoDelete(true); connect( partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* ))); - m_actionPreview = new KAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, TQT_SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output"); + m_actionPreview = new TDEAction(i18n("Preview Doxygen Output"), 0, CTRL+ALT+Key_P, this, TQT_SLOT(slotRunPreview()), actionCollection(), "show_preview_doxygen_output"); m_actionPreview->setToolTip( i18n("Show a preview of the Doxygen output of this file") ); m_actionPreview->setWhatsThis( i18n("<b>Preview Doxygen output</b><p>Runs Doxygen over the current file and shows the created index.html.") ); diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h index 0a6ea9b4..6882e932 100644 --- a/parts/doxygen/doxygenpart.h +++ b/parts/doxygen/doxygenpart.h @@ -25,7 +25,7 @@ class DoxygenDialog; class TQPopupMenu; class Context; -class KAction; +class TDEAction; class KDialogBase; class ConfigWidgetProxy; @@ -102,11 +102,11 @@ private: //needed for doxygen preview TQString m_file; KTempDir m_tmpDir; - KAction* m_action; + TDEAction* m_action; //needed for documentFunction - KAction* m_actionDocumentFunction; - KAction* m_actionPreview; + TDEAction* m_actionDocumentFunction; + TDEAction* m_actionPreview; KTextEditor::EditInterface* m_activeEditor; KTextEditor::ViewCursorInterface* m_cursor; }; diff --git a/parts/filecreate/filecreate_listitem.cpp b/parts/filecreate/filecreate_listitem.cpp index 09dd0dc4..d792ab26 100644 --- a/parts/filecreate/filecreate_listitem.cpp +++ b/parts/filecreate/filecreate_listitem.cpp @@ -21,7 +21,7 @@ namespace FileCreate { ListItem::ListItem(TQListView * listview, const FileType * filetype) : - KListViewItem(listview), m_filetype(filetype), + TDEListViewItem(listview), m_filetype(filetype), m_filetypeRenderer(NULL) { init(); @@ -29,7 +29,7 @@ namespace FileCreate { ListItem::ListItem(ListItem * listitem, const FileType * filetype) : - KListViewItem(listitem), m_filetype(filetype), + TDEListViewItem(listitem), m_filetype(filetype), m_filetypeRenderer(NULL) { init(); @@ -46,12 +46,12 @@ namespace FileCreate { m_filetypeRenderer = new TQSimpleRichText( text(1), listView()->font() ); m_filetypeRenderer->setWidth(listView()->columnWidth(1)); setHeight(m_filetypeRenderer->height()); - KListViewItem::setup(); + TDEListViewItem::setup(); } void ListItem::setHeight( int height ) { - KListViewItem::setHeight( TQMAX(TQMAX(height,m_iconHeight), m_filetypeRenderer->height() ) ); + TDEListViewItem::setHeight( TQMAX(TQMAX(height,m_iconHeight), m_filetypeRenderer->height() ) ); } void ListItem::prepareResize() { @@ -73,7 +73,7 @@ namespace FileCreate { return; } - KListViewItem::paintCell( p, cg, column, width, align ); + TDEListViewItem::paintCell( p, cg, column, width, align ); } void ListItem::init() diff --git a/parts/filecreate/filecreate_listitem.h b/parts/filecreate/filecreate_listitem.h index 5dae2dcd..6cb9ecc5 100644 --- a/parts/filecreate/filecreate_listitem.h +++ b/parts/filecreate/filecreate_listitem.h @@ -21,7 +21,7 @@ class TQSimpleRichText; namespace FileCreate { -class ListItem : public KListViewItem { +class ListItem : public TDEListViewItem { public: ListItem(TQListView *listview, const FileType *filetype); diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index 0c907db1..0d4db9bc 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -78,7 +78,7 @@ FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStrin this, TQT_SLOT(insertConfigWidget(const KDialogBase*, TQWidget*, unsigned int )) ); - KToolBarPopupAction * newAction = new KToolBarPopupAction( i18n("&New"), "filenew", CTRL+TQt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new"); + TDEToolBarPopupAction * newAction = new TDEToolBarPopupAction( i18n("&New"), "filenew", CTRL+TQt::Key_N, this, TQT_SLOT(slotNewFile()), actionCollection(), "file_new"); newAction->setWhatsThis( i18n("<b>New file</b><p>Creates a new file. Also adds it the project if the <b>Add to project</b> checkbox is turned on.") ); newAction->setToolTip( i18n("Create a new file") ); m_newPopupMenu = newAction->popupMenu(); @@ -140,13 +140,13 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() m_newPopupMenu->setItemParameter( id, (long)filetype ); } else { - KPopupMenu* subMenu = NULL; + TDEPopupMenu* subMenu = NULL; TQPtrList<FileType> subtypes = filetype->subtypes(); for(FileType * subtype = subtypes.first(); subtype; subtype=subtypes.next()) { if (subtype->enabled()){ if( !subMenu ) - subMenu = new KPopupMenu(0,0); + subMenu = new TDEPopupMenu(0,0); TQPixmap iconPix = m_iconLoader->loadIcon( subtype->icon(), KIcon::Desktop, KIcon::SizeSmall, KIcon::DefaultState, NULL, true); @@ -159,7 +159,7 @@ void FileCreatePart::slotAboutToShowNewPopupMenu() { if( !m_subPopups ) { - m_subPopups = new TQPtrList<KPopupMenu>; + m_subPopups = new TQPtrList<TDEPopupMenu>; m_subPopups->setAutoDelete(true); } m_subPopups->append( subMenu ); diff --git a/parts/filecreate/filecreate_part.h b/parts/filecreate/filecreate_part.h index 18a9ccb1..9d090493 100644 --- a/parts/filecreate/filecreate_part.h +++ b/parts/filecreate/filecreate_part.h @@ -23,7 +23,7 @@ #include "filecreate_typechooser.h" -class KPopupMenu; +class TDEPopupMenu; namespace FileCreate { class Widget; @@ -92,7 +92,7 @@ public slots: void slotNewFile(); /** - * Called from KToolBarPopupMenu to request a new file action + * Called from TDEToolBarPopupMenu to request a new file action * @param pFileType is acutally a pointer to FileType */ void slotNewFilePopup(int pFileType); @@ -137,8 +137,8 @@ private: ConfigWidgetProxy * _configProxy; - KPopupMenu* m_newPopupMenu; - TQPtrList<KPopupMenu>* m_subPopups; + TDEPopupMenu* m_newPopupMenu; + TQPtrList<TDEPopupMenu>* m_subPopups; }; diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp index 2bc308b6..9226edf4 100644 --- a/parts/filecreate/filecreate_widget3.cpp +++ b/parts/filecreate/filecreate_widget3.cpp @@ -30,7 +30,7 @@ namespace FileCreate { ListWidget::ListWidget(FileCreatePart *part) - : KListView(0, "KDevFileCreate"), TypeChooser(part) + : TDEListView(0, "KDevFileCreate"), TypeChooser(part) { setIcon( SmallIcon("filenew2") ); setCaption(i18n("File Create")); @@ -82,7 +82,7 @@ namespace FileCreate { li->prepareResize(); li = dynamic_cast<ListItem*>(li->nextSibling()); } - KListView::resizeEvent(event); + TDEListView::resizeEvent(event); } void ListWidget::refresh() { diff --git a/parts/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h index cdc2e499..863e3d73 100644 --- a/parts/filecreate/filecreate_widget3.h +++ b/parts/filecreate/filecreate_widget3.h @@ -27,7 +27,7 @@ namespace FileCreate { class FileType; - class ListWidget : public KListView, public TypeChooser + class ListWidget : public TDEListView, public TypeChooser { Q_OBJECT diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 93769573..150bd156 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -35,7 +35,7 @@ * @return */ FileListWidget::FileListWidget(ProjectviewPart *part, TQWidget *parent) - : KListView(parent), TQToolTip( viewport() ), _part( part ) + : TDEListView(parent), TQToolTip( viewport() ), _part( part ) { addColumn( "" ); header()->hide(); @@ -132,7 +132,7 @@ void FileListWidget::refreshFileList( ) TQStringList selections = storeSelections(); int scrollbarPos = verticalScrollBar()->value(); - KListView::clear(); + TDEListView::clear(); KURL::List list = _part->partController()->openURLs(); TQValueListIterator<KURL> it = list.begin(); @@ -224,7 +224,7 @@ void FileListWidget::popupMenu( TQListViewItem * item, const TQPoint & p, int ) { if ( item ) { - KPopupMenu popup; + TDEPopupMenu popup; popup.insertTitle( i18n("File List") ); popup.insertItem( i18n("Close Selected"), this, TQT_SLOT(closeSelectedFiles()) ); popup.insertItem( i18n("Save Selected"), this, TQT_SLOT(saveSelectedFiles()) ); diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h index 19ed6329..b61cd8cc 100644 --- a/parts/filelist/filelist_widget.h +++ b/parts/filelist/filelist_widget.h @@ -30,7 +30,7 @@ class FileListItem; namespace KParts { class Part; } -class FileListWidget : public KListView, public TQToolTip +class FileListWidget : public TDEListView, public TQToolTip { Q_OBJECT diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index e963ac9f..6763dff4 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -275,23 +275,23 @@ void ProjectviewPart::init() void ProjectviewPart::setupActions() { - m_openPrjViewAction = new KSelectAction(i18n("Open Session..."), 0, actionCollection(), "viewsession_open"); + m_openPrjViewAction = new TDESelectAction(i18n("Open Session..."), 0, actionCollection(), "viewsession_open"); connect(m_openPrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotOpenProjectView(const TQString &))); m_openPrjViewAction->setToolTip(i18n("Open Session")); - m_savePrjViewAction = new KAction(i18n("Save Session"), "filesave", 0, this, TQT_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); + m_savePrjViewAction = new TDEAction(i18n("Save Session"), "filesave", 0, this, TQT_SLOT(slotSaveProjectView()), actionCollection(), "viewsession_save"); - m_newPrjViewAction = new KAction(i18n("New Session..."), "filenew", 0, this, TQT_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); + m_newPrjViewAction = new TDEAction(i18n("New Session..."), "filenew", 0, this, TQT_SLOT(slotSaveAsProjectView()), actionCollection(), "viewsession_new"); - m_deletePrjViewAction = new KSelectAction(i18n("Delete Session"), "editdelete", 0, actionCollection(), "viewsession_delete"); + m_deletePrjViewAction = new TDESelectAction(i18n("Delete Session"), "editdelete", 0, actionCollection(), "viewsession_delete"); connect(m_deletePrjViewAction, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotDeleteProjectView(const TQString &))); m_deletePrjViewAction->setToolTip(i18n("Delete Session")); - m_deleteCurrentPrjViewAction = new KAction(i18n("Delete Session"), "editdelete", 0, this, TQT_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); + m_deleteCurrentPrjViewAction = new TDEAction(i18n("Delete Session"), "editdelete", 0, this, TQT_SLOT(slotDeleteProjectViewCurent()), actionCollection(), "viewsession_deletecurrent"); m_deleteCurrentPrjViewAction->setToolTip(i18n("Delete Session")); diff --git a/parts/filelist/projectviewpart.h b/parts/filelist/projectviewpart.h index d2924c61..732ef0f3 100644 --- a/parts/filelist/projectviewpart.h +++ b/parts/filelist/projectviewpart.h @@ -32,13 +32,13 @@ class TQPopupMenu; -class KAction; -class KSelectAction; +class TDEAction; +class TDESelectAction; class KDialogBase; class Context; class ConfigWidgetProxy; class FileListWidget; -class KToolBar; +class TDEToolBar; class TQVBox; class ToolbarGUIBuilder; @@ -147,11 +147,11 @@ private: ViewMap m_projectViews; //container for the views - KAction *m_savePrjViewAction; - KAction *m_newPrjViewAction; - KAction *m_deleteCurrentPrjViewAction; - KSelectAction *m_openPrjViewAction; - KSelectAction *m_deletePrjViewAction; + TDEAction *m_savePrjViewAction; + TDEAction *m_newPrjViewAction; + TDEAction *m_deleteCurrentPrjViewAction; + TDESelectAction *m_openPrjViewAction; + TDESelectAction *m_deletePrjViewAction; TQString m_currentProjectView; TQString m_defaultProjectView; // load this after project loaded diff --git a/parts/filelist/toolbarguibuilder.cpp b/parts/filelist/toolbarguibuilder.cpp index e292d092..03e9acfd 100644 --- a/parts/filelist/toolbarguibuilder.cpp +++ b/parts/filelist/toolbarguibuilder.cpp @@ -23,7 +23,7 @@ #include <ktoolbar.h> ToolbarGUIBuilder::ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget) - : KXMLGUIBuilder(widget), KToolBar(parent, "ToolbarGUIbuilder"), m_parent(parent) + : KXMLGUIBuilder(widget), TDEToolBar(parent, "ToolbarGUIbuilder"), m_parent(parent) { // setHidden(true); setFrameStyle(0); diff --git a/parts/filelist/toolbarguibuilder.h b/parts/filelist/toolbarguibuilder.h index e81c300e..477e9c13 100644 --- a/parts/filelist/toolbarguibuilder.h +++ b/parts/filelist/toolbarguibuilder.h @@ -31,7 +31,7 @@ * toolview * @author Jens Herden */ -class ToolbarGUIBuilder : public KXMLGUIBuilder, public KToolBar +class ToolbarGUIBuilder : public KXMLGUIBuilder, public TDEToolBar { public: ToolbarGUIBuilder(TQWidget *parent, TQWidget *widget); diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index 82587ac0..a98200ed 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -54,7 +54,7 @@ FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQS m_filetree->readConfig( instance()->config(), "fileselector" ); - m_newFileAction = new KAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQT_SLOT(newFile()), this); + m_newFileAction = new TDEAction(i18n("New File..."), CTRL+ALT+SHIFT+Key_N, this, TQT_SLOT(newFile()), this); } FileSelectorPart::~FileSelectorPart() diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h index c4cae6e1..f415444d 100644 --- a/parts/fileselector/fileselector_part.h +++ b/parts/fileselector/fileselector_part.h @@ -19,7 +19,7 @@ public: FileSelectorPart(TQObject *parent, const char *name, const TQStringList &); virtual ~FileSelectorPart(); - KAction *newFileAction() const { return m_newFileAction; } + TDEAction *newFileAction() const { return m_newFileAction; } public slots: // void showTip(); @@ -34,7 +34,7 @@ private slots: private: TQGuardedPtr<KDevFileSelector> m_filetree; - KAction *m_newFileAction; + TDEAction *m_newFileAction; }; diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 284b24da..295ff957 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -77,7 +77,7 @@ static void silenceTQToolBar(TQtMsgType, const char *) KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent) - : KToolBar( parent, "KDev FileSelector Toolbar", true ) + : TDEToolBar( parent, "KDev FileSelector Toolbar", true ) { setMinimumWidth(10); } @@ -87,7 +87,7 @@ KDevFileSelectorToolBar::~KDevFileSelectorToolBar() void KDevFileSelectorToolBar::setMovingEnabled( bool) { - KToolBar::setMovingEnabled(false); + TDEToolBar::setMovingEnabled(false); } @@ -121,7 +121,7 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main mainwin(mainWindow), partController(partController) { - mActionCollection = new KActionCollection( this ); + mActionCollection = new TDEActionCollection( this ); TQVBoxLayout* lo = new TQVBoxLayout(this); @@ -145,21 +145,21 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main dir = new KDevDirOperator(m_part, KURL(), this, "operator"); dir->setView(KFile::/*Simple*/Detail); - KActionCollection *coll = dir->actionCollection(); + TDEActionCollection *coll = dir->actionCollection(); // some shortcuts of diroperator that clashes with KDev - coll->action( "delete" )->setShortcut( KShortcut( ALT + Key_Delete ) ); - coll->action( "reload" )->setShortcut( KShortcut( ALT + Key_F5 ) ); - coll->action( "back" )->setShortcut( KShortcut( ALT + SHIFT + Key_Left ) ); - coll->action( "forward" )->setShortcut( KShortcut( ALT + SHIFT + Key_Right ) ); + coll->action( "delete" )->setShortcut( TDEShortcut( ALT + Key_Delete ) ); + coll->action( "reload" )->setShortcut( TDEShortcut( ALT + Key_F5 ) ); + coll->action( "back" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Left ) ); + coll->action( "forward" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Right ) ); // some consistency - reset up for dir too - coll->action( "up" )->setShortcut( KShortcut( ALT + SHIFT + Key_Up ) ); - coll->action( "home" )->setShortcut( KShortcut( CTRL + ALT + Key_Home ) ); + coll->action( "up" )->setShortcut( TDEShortcut( ALT + SHIFT + Key_Up ) ); + coll->action( "home" )->setShortcut( TDEShortcut( CTRL + ALT + Key_Home ) ); lo->addWidget(dir); lo->setStretchFactor(dir, 2); // bookmarks action! - KActionMenu *acmBookmarks = new KActionMenu( i18n("Bookmarks"), "bookmark", + TDEActionMenu *acmBookmarks = new TDEActionMenu( i18n("Bookmarks"), "bookmark", mActionCollection, "bookmarks" ); acmBookmarks->setDelayed( false ); @@ -185,9 +185,9 @@ KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *main filter, TQT_SLOT( addToHistory(const TQString&) ) ); // kaction for the dir sync method - acSyncDir = new KAction( i18n("Current Document Directory"), "dirsynch", 0, + acSyncDir = new TDEAction( i18n("Current Document Directory"), "dirsynch", 0, TQT_TQOBJECT(this), TQT_SLOT( setActiveDocumentDir() ), mActionCollection, "sync_dir" ); - toolbar->setIconText( KToolBar::IconOnly ); + toolbar->setIconText( TDEToolBar::IconOnly ); toolbar->setIconSize( 16 ); toolbar->setEnableContextMenu( false ); @@ -299,7 +299,7 @@ void KDevFileSelector::setupToolbar( TDEConfig *config ) "short view" << "detailed view" << "bookmarks" << "sync_dir"; } - KAction *ac; + TDEAction *ac; for ( TQStringList::Iterator it=tbactions.begin(); it != tbactions.end(); ++it ) { if ( *it == "bookmarks" || *it == "sync_dir" ) @@ -586,7 +586,7 @@ KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelect // Toolbar - a lot for a little... TQGroupBox *gbToolbar = new TQGroupBox( 1, Qt::Vertical, i18n("Toolbar"), this ); - acSel = new KActionSelector( gbToolbar ); + acSel = new TDEActionSelector( gbToolbar ); acSel->setAvailableLabel( i18n("A&vailable actions:") ); acSel->setSelectedLabel( i18n("S&elected actions:") ); lo->addWidget( gbToolbar ); @@ -758,7 +758,7 @@ void KFSConfigPage::init() "show hidden" << "properties"*/ << "bookmarks" << "sync_dir"; TQRegExp re("&(?=[^&])"); - KAction *ac; + TDEAction *ac; TQListBox *lb; for ( TQStringList::Iterator it=allActions.begin(); it != allActions.end(); ++it ) { @@ -798,10 +798,10 @@ void KDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos ) setupMenu(); updateSelectionDependentActions(); - KActionMenu * am = dynamic_cast<KActionMenu*>(actionCollection()->action("popupMenu")); + TDEActionMenu * am = dynamic_cast<TDEActionMenu*>(actionCollection()->action("popupMenu")); if (!am) return; - KPopupMenu *popup = am->popupMenu(); + TDEPopupMenu *popup = am->popupMenu(); popup->insertSeparator(); m_part->newFileAction()->plug(popup); diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index 7c80a6de..c95335a2 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -32,8 +32,8 @@ class KDevMainWindow; class KDevPartController; class FileSelectorPart; -class KActionCollection; -class KActionSelector; +class TDEActionCollection; +class TDEActionSelector; class KDirOperator; class KURLComboBox; class KHistoryCombo; @@ -57,7 +57,7 @@ namespace KTextEditor */ /* I think this fix for not moving toolbars is better */ -class KDevFileSelectorToolBar: public KToolBar +class KDevFileSelectorToolBar: public TDEToolBar { Q_OBJECT @@ -121,7 +121,7 @@ public: void setupToolbar( TDEConfig * ); void setView( KFile::FileView ); KDevDirOperator *dirOperator(){ return dir; } - KActionCollection *actionCollection() { return mActionCollection; }; + TDEActionCollection *actionCollection() { return mActionCollection; }; public slots: void slotFilterChange(const TQString&); @@ -147,11 +147,11 @@ protected: private: class KDevFileSelectorToolBar *toolbar; - KActionCollection *mActionCollection; + TDEActionCollection *mActionCollection; class KBookmarkHandler *bookmarkHandler; KURLComboBox *cmbPath; KDevDirOperator * dir; - class KAction *acSyncDir; + class TDEAction *acSyncDir; KHistoryCombo * filter; class TQToolButton *btnFilter; @@ -197,7 +197,7 @@ private: KDevFileSelector *fileSelector; bool bDirty; //class TQListBox *lbAvailableActions, *lbUsedActions; - KActionSelector *acSel; + TDEActionSelector *acSel; class TQSpinBox *sbPathHistLength, *sbFilterHistLength; class TQCheckBox *cbSyncOpen, *cbSyncActive, *cbSyncShow; class TQCheckBox *cbSesLocation, *cbSesFilter; diff --git a/parts/fileselector/kactionselector.cpp b/parts/fileselector/kactionselector.cpp index 3d2a67c3..0b5b3801 100644 --- a/parts/fileselector/kactionselector.cpp +++ b/parts/fileselector/kactionselector.cpp @@ -32,24 +32,24 @@ #include <tqevent.h> #include <tqwhatsthis.h> -class KActionSelectorPrivate { +class TDEActionSelectorPrivate { public: TQListBox *availableListBox, *selectedListBox; TQToolButton *btnAdd, *btnRemove, *btnUp, *btnDown; TQLabel *lAvailable, *lSelected; bool moveOnDoubleClick, keyboardEnabled; - KActionSelector::ButtonIconSize iconSize; + TDEActionSelector::ButtonIconSize iconSize; TQString addIcon, removeIcon, upIcon, downIcon; - KActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy; + TDEActionSelector::InsertionPolicy availableInsertionPolicy, selectedInsertionPolicy; bool showUpDownButtons; }; //BEGIN Constructor/destructor -KActionSelector::KActionSelector( TQWidget *parent, const char *name ) +TDEActionSelector::TDEActionSelector( TQWidget *parent, const char *name ) : TQWidget( parent, name ) { - d = new KActionSelectorPrivate(); + d = new TDEActionSelectorPrivate(); d->moveOnDoubleClick = true; d->keyboardEnabled = true; d->iconSize = SmallIcon; @@ -115,7 +115,7 @@ KActionSelector::KActionSelector( TQWidget *parent, const char *name ) d->selectedListBox->installEventFilter( this ); } -KActionSelector::~KActionSelector() +TDEActionSelector::~TDEActionSelector() { delete d; } @@ -124,17 +124,17 @@ KActionSelector::~KActionSelector() //BEGIN Public Methods -TQListBox *KActionSelector::availableListBox() +TQListBox *TDEActionSelector::availableListBox() { return d->availableListBox; } -TQListBox *KActionSelector::selectedListBox() +TQListBox *TDEActionSelector::selectedListBox() { return d->selectedListBox; } -void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button ) +void TDEActionSelector::setButtonIcon( const TQString &icon, MoveButton button ) { switch ( button ) { @@ -155,11 +155,11 @@ void KActionSelector::setButtonIcon( const TQString &icon, MoveButton button ) d->btnDown->setIconSet( SmallIconSet( icon, d->iconSize ) ); break; default: - kdDebug()<<"KActionSelector::setButtonIcon: DAINBREAD!"<<endl; + kdDebug()<<"TDEActionSelector::setButtonIcon: DAINBREAD!"<<endl; } } -void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button ) +void TDEActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton button ) { switch ( button ) { @@ -176,11 +176,11 @@ void KActionSelector::setButtonIconSet( const TQIconSet &iconset, MoveButton but d->btnDown->setIconSet( iconset ); break; default: - kdDebug()<<"KActionSelector::setButtonIconSet: DAINBREAD!"<<endl; + kdDebug()<<"TDEActionSelector::setButtonIconSet: DAINBREAD!"<<endl; } } -void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button ) +void TDEActionSelector::setButtonTooltip( const TQString &tip, MoveButton button ) { switch ( button ) { @@ -197,11 +197,11 @@ void KActionSelector::setButtonTooltip( const TQString &tip, MoveButton button ) d->btnDown->setTextLabel( tip ); break; default: - kdDebug()<<"KActionSelector::setButtonToolTip: DAINBREAD!"<<endl; + kdDebug()<<"TDEActionSelector::setButtonToolTip: DAINBREAD!"<<endl; } } -void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button ) +void TDEActionSelector::setButtonWhatsThis( const TQString &text, MoveButton button ) { switch ( button ) { @@ -218,11 +218,11 @@ void KActionSelector::setButtonWhatsThis( const TQString &text, MoveButton butto TQWhatsThis::add( d->btnDown, text ); break; default: - kdDebug()<<"KActionSelector::setButtonWhatsThis: DAINBREAD!"<<endl; + kdDebug()<<"TDEActionSelector::setButtonWhatsThis: DAINBREAD!"<<endl; } } -void KActionSelector::setButtonsEnabled() +void TDEActionSelector::setButtonsEnabled() { d->btnAdd->setEnabled( d->availableListBox->currentItem() > -1 ); d->btnRemove->setEnabled( d->selectedListBox->currentItem() > -1 ); @@ -235,84 +235,84 @@ void KActionSelector::setButtonsEnabled() //BEGIN Properties -bool KActionSelector::moveOnDoubleClick() const +bool TDEActionSelector::moveOnDoubleClick() const { return d->moveOnDoubleClick; } -void KActionSelector::setMoveOnDoubleClick( bool b ) +void TDEActionSelector::setMoveOnDoubleClick( bool b ) { d->moveOnDoubleClick = b; } -bool KActionSelector::keyboardEnabled() const +bool TDEActionSelector::keyboardEnabled() const { return d->keyboardEnabled; } -void KActionSelector::setKeyboardEnabled( bool b ) +void TDEActionSelector::setKeyboardEnabled( bool b ) { d->keyboardEnabled = b; } -TQString KActionSelector::availableLabel() const +TQString TDEActionSelector::availableLabel() const { return d->lAvailable->text(); } -void KActionSelector::setAvailableLabel( const TQString &text ) +void TDEActionSelector::setAvailableLabel( const TQString &text ) { d->lAvailable->setText( text ); } -TQString KActionSelector::selectedLabel() const +TQString TDEActionSelector::selectedLabel() const { return d->lSelected->text(); } -void KActionSelector::setSelectedLabel( const TQString &text ) +void TDEActionSelector::setSelectedLabel( const TQString &text ) { d->lSelected->setText( text ); } -KActionSelector::ButtonIconSize KActionSelector::buttonIconSize() const +TDEActionSelector::ButtonIconSize TDEActionSelector::buttonIconSize() const { return d->iconSize; } -void KActionSelector::setButtonIconSize( ButtonIconSize size ) +void TDEActionSelector::setButtonIconSize( ButtonIconSize size ) { d->iconSize = size; // reload icons loadIcons(); } -KActionSelector::InsertionPolicy KActionSelector::availableInsertionPolicy() const +TDEActionSelector::InsertionPolicy TDEActionSelector::availableInsertionPolicy() const { return d->availableInsertionPolicy; } -void KActionSelector::setAvailableInsertionPolicy( InsertionPolicy p ) +void TDEActionSelector::setAvailableInsertionPolicy( InsertionPolicy p ) { d->availableInsertionPolicy = p; } -KActionSelector::InsertionPolicy KActionSelector::selectedInsertionPolicy() const +TDEActionSelector::InsertionPolicy TDEActionSelector::selectedInsertionPolicy() const { return d->selectedInsertionPolicy; } -void KActionSelector::setSelectedInsertionPolicy( InsertionPolicy p ) +void TDEActionSelector::setSelectedInsertionPolicy( InsertionPolicy p ) { d->selectedInsertionPolicy = p; } -bool KActionSelector::showUpDownButtons() const +bool TDEActionSelector::showUpDownButtons() const { return d->showUpDownButtons; } -void KActionSelector::setShowUpDownButtons( bool show ) +void TDEActionSelector::setShowUpDownButtons( bool show ) { d->showUpDownButtons = show; if ( show ) @@ -331,7 +331,7 @@ void KActionSelector::setShowUpDownButtons( bool show ) //BEGIN Public Slots -void KActionSelector::polish() +void TDEActionSelector::polish() { setButtonsEnabled(); } @@ -339,7 +339,7 @@ void KActionSelector::polish() //END Public Slots //BEGIN Protected -void KActionSelector::keyPressEvent( TQKeyEvent *e ) +void TDEActionSelector::keyPressEvent( TQKeyEvent *e ) { if ( ! d->keyboardEnabled ) return; if ( (e->state() & TQt::ControlButton) ) @@ -365,7 +365,7 @@ void KActionSelector::keyPressEvent( TQKeyEvent *e ) } } -bool KActionSelector::eventFilter( TQObject *o, TQEvent *e ) +bool TDEActionSelector::eventFilter( TQObject *o, TQEvent *e ) { if ( d->keyboardEnabled && e->type() == TQEvent::KeyPress ) { @@ -412,7 +412,7 @@ bool KActionSelector::eventFilter( TQObject *o, TQEvent *e ) //BEGIN Private Slots -void KActionSelector::buttonAddClicked() +void TDEActionSelector::buttonAddClicked() { // move all selected items from available to selected listbox TQListBoxItem *item = d->availableListBox->firstItem(); @@ -430,7 +430,7 @@ void KActionSelector::buttonAddClicked() d->selectedListBox->setFocus(); } -void KActionSelector::buttonRemoveClicked() +void TDEActionSelector::buttonRemoveClicked() { // move all selected items from selected to available listbox TQListBoxItem *item = d->selectedListBox->firstItem(); @@ -448,7 +448,7 @@ void KActionSelector::buttonRemoveClicked() d->availableListBox->setFocus(); } -void KActionSelector::buttonUpClicked() +void TDEActionSelector::buttonUpClicked() { int c = d->selectedListBox->currentItem(); if ( c < 0 ) return; @@ -459,7 +459,7 @@ void KActionSelector::buttonUpClicked() emit movedUp( item ); } -void KActionSelector::buttonDownClicked() +void TDEActionSelector::buttonDownClicked() { int c = d->selectedListBox->currentItem(); if ( c < 0 ) return; @@ -470,7 +470,7 @@ void KActionSelector::buttonDownClicked() emit movedDown( item ); } -void KActionSelector::itemDoubleClicked( TQListBoxItem *item ) +void TDEActionSelector::itemDoubleClicked( TQListBoxItem *item ) { if ( d->moveOnDoubleClick ) moveItem( item ); @@ -480,7 +480,7 @@ void KActionSelector::itemDoubleClicked( TQListBoxItem *item ) //BEGIN Private Methods -void KActionSelector::loadIcons() +void TDEActionSelector::loadIcons() { d->btnAdd->setIconSet( SmallIconSet( d->addIcon, d->iconSize ) ); d->btnRemove->setIconSet( SmallIconSet( d->removeIcon, d->iconSize ) ); @@ -488,7 +488,7 @@ void KActionSelector::loadIcons() d->btnDown->setIconSet( SmallIconSet( d->downIcon, d->iconSize ) ); } -void KActionSelector::moveItem( TQListBoxItem *item ) +void TDEActionSelector::moveItem( TQListBoxItem *item ) { TQListBox *lbFrom = item->listBox(); TQListBox *lbTo; @@ -515,7 +515,7 @@ void KActionSelector::moveItem( TQListBoxItem *item ) emit removed( item ); } -int KActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy ) +int TDEActionSelector::insertionIndex( TQListBox *lb, InsertionPolicy policy ) { int index; switch ( policy ) diff --git a/parts/fileselector/kactionselector.h b/parts/fileselector/kactionselector.h index b5dd65d3..a1c26394 100644 --- a/parts/fileselector/kactionselector.h +++ b/parts/fileselector/kactionselector.h @@ -27,7 +27,7 @@ class TQKeyEvent; class TQEvent; class TQIconSet; -class KActionSelectorPrivate; +class TDEActionSelectorPrivate; /** @short A widget for selecting and arranging actions/objects @@ -73,7 +73,7 @@ class KActionSelectorPrivate; @author Anders Lund <anders@alweb.dk> */ -class KActionSelector : public TQWidget { +class TDEActionSelector : public TQWidget { Q_OBJECT TQ_ENUMS( ButtonIconSize InsertionPolicy ) @@ -87,8 +87,8 @@ class KActionSelector : public TQWidget { TQ_PROPERTY( bool showUpDownButtons READ showUpDownButtons WRITE setShowUpDownButtons ) public: - KActionSelector( TQWidget *parent=0, const char *name=0 ); - ~KActionSelector(); + TDEActionSelector( TQWidget *parent=0, const char *name=0 ); + ~TDEActionSelector(); /** @return The TQListBox holding the available actions @@ -394,7 +394,7 @@ private: /** Private data storage */ - KActionSelectorPrivate *d; + TDEActionSelectorPrivate *d; }; #endif // _KACTION_SELECTOR_H_ diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp index 6467b83f..4c1c0271 100644 --- a/parts/fileselector/kbookmarkhandler.cpp +++ b/parts/fileselector/kbookmarkhandler.cpp @@ -35,7 +35,7 @@ #include "kbookmarkhandler.moc" -KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, KPopupMenu* kpopupmenu ) +KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* kpopupmenu ) : TQObject( parent, "KBookmarkHandler" ), KBookmarkOwner(), mParent( parent ), @@ -43,7 +43,7 @@ KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, KPopupMenu* kpopup m_importStream( 0L ) { if (!m_menu) - m_menu = new KPopupMenu( parent, "bookmark menu" ); + m_menu = new TDEPopupMenu( parent, "bookmark menu" ); TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" ); if ( file.isEmpty() ) diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h index 42d5df58..38091e0f 100644 --- a/parts/fileselector/kbookmarkhandler.h +++ b/parts/fileselector/kbookmarkhandler.h @@ -25,8 +25,8 @@ #include "fileselector_widget.h" class TQTextStream; -class KPopupMenu; -class KActionMenu; +class TDEPopupMenu; +class TDEActionMenu; class KBookmarkHandler : public TQObject, public KBookmarkOwner { @@ -34,14 +34,14 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner public: - KBookmarkHandler( KDevFileSelector *parent, KPopupMenu *kpopupmenu=0 ); + KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu *kpopupmenu=0 ); ~KBookmarkHandler(); // KBookmarkOwner interface: virtual void openBookmarkURL( const TQString& url ) { emit openURL( url ); } virtual TQString currentURL() const; - KPopupMenu *menu() const { return m_menu; } + TDEPopupMenu *menu() const { return m_menu; } signals: void openURL( const TQString& url ); @@ -59,7 +59,7 @@ protected: private: KDevFileSelector *mParent; - KPopupMenu *m_menu; + TDEPopupMenu *m_menu; KBookmarkMenu *m_bookmarkMenu; TQTextStream *m_importStream; diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index e0222eb5..d1629d1e 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -152,7 +152,7 @@ FileGroupsFileItem::FileGroupsFileItem(TQListViewItem *parent, const TQString &f } FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) - : KListView(0, "file view widget"), + : TDEListView(0, "file view widget"), m_actionToggleShowNonProjectFiles( 0 ), m_actionToggleDisplayLocation( 0 ) { /* @@ -175,15 +175,15 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); - m_actionToggleShowNonProjectFiles = new KToggleAction( i18n("Show Non Project Files"), KShortcut(), + m_actionToggleShowNonProjectFiles = new TDEToggleAction( i18n("Show Non Project Files"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotToggleShowNonProjectFiles()), TQT_TQOBJECT(this), "actiontoggleshowshownonprojectfiles" ); m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files")); m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree.")); - m_actionToggleDisplayLocation = new KToggleAction( i18n("Display Location Column"), KShortcut(), + m_actionToggleDisplayLocation = new TDEToggleAction( i18n("Display Location Column"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotToggleDisplayLocation()), TQT_TQOBJECT(this), "actiontoggleshowlocation" ); m_actionToggleDisplayLocation->setWhatsThis(i18n("<b>Display the Location Column</b><p>Displays a column with the location of the files.")); @@ -222,9 +222,9 @@ void FileGroupsWidget::slotItemExecuted(TQListViewItem *item) } -void FileGroupsWidget::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p) +void FileGroupsWidget::slotContextMenu(TDEListView *, TQListViewItem *item, const TQPoint &p) { - KPopupMenu popup(this); + TDEPopupMenu popup(this); popup.insertTitle(i18n("File Groups")); /// @todo Add, remove groups int customizeId = popup.insertItem(i18n("Customize...")); diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h index 7e0a4204..355c9662 100644 --- a/parts/fileview/filegroupswidget.h +++ b/parts/fileview/filegroupswidget.h @@ -18,7 +18,7 @@ class FileGroupsPart; class KDevProject; -class FileGroupsWidget : public KListView +class FileGroupsWidget : public TDEListView { Q_OBJECT @@ -34,7 +34,7 @@ public slots: private slots: void slotItemExecuted(TQListViewItem *item); - void slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p); + void slotContextMenu(TDEListView *, TQListViewItem *item, const TQPoint &p); void slotToggleShowNonProjectFiles(); void slotToggleDisplayLocation(); @@ -46,8 +46,8 @@ private: TQStringList allFilesRecursively( TQString const & ); FileGroupsPart *m_part; - class KToggleAction *m_actionToggleShowNonProjectFiles; - class KToggleAction *m_actionToggleDisplayLocation; + class TDEToggleAction *m_actionToggleShowNonProjectFiles; + class TDEToggleAction *m_actionToggleDisplayLocation; int LocationID; }; diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp index f1b557f2..044055cb 100644 --- a/parts/fileview/filetreeviewwidgetimpl.cpp +++ b/parts/fileview/filetreeviewwidgetimpl.cpp @@ -37,7 +37,7 @@ FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const ch kdDebug(9017) << "FileTreeViewWidgetImpl::FileTreeViewWidgetImpl()" << endl; // Actions - m_actionToggleShowNonProjectFiles = new KToggleAction( i18n("Show Non Project Files"), KShortcut(), + m_actionToggleShowNonProjectFiles = new TDEToggleAction( i18n("Show Non Project Files"), TDEShortcut(), this, TQT_SLOT(slotToggleShowNonProjectFiles()), this, "actiontoggleshowshownonprojectfiles" ); m_actionToggleShowNonProjectFiles->setCheckedState(i18n("Hide Non Project Files")); m_actionToggleShowNonProjectFiles->setWhatsThis(i18n("<b>Show non project files</b><p>Shows files that do not belong to a project in a file tree.")); diff --git a/parts/fileview/filetreeviewwidgetimpl.h b/parts/fileview/filetreeviewwidgetimpl.h index 6cee53f8..bca8b1cd 100644 --- a/parts/fileview/filetreeviewwidgetimpl.h +++ b/parts/fileview/filetreeviewwidgetimpl.h @@ -28,7 +28,7 @@ namespace filetreeview } class FileViewPart; class TQHeader; -class KToggleAction; +class TDEToggleAction; class TQPopupMenu; /** @@ -100,7 +100,7 @@ private: bool m_isReloadingTree; - KToggleAction *m_actionToggleShowNonProjectFiles; + TDEToggleAction *m_actionToggleShowNonProjectFiles; }; #endif diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index 904f3710..caa43466 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -72,8 +72,8 @@ FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFil // Slot connections connect( this, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotItemExecuted(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); // Intercepts KDevelop core signals and VCS notifications (if available) connect( m_part->project(), TQT_SIGNAL( activeDirectoryChanged( const TQString&, const TQString& ) ), this, TQT_SLOT( changeActiveDirectory( const TQString&, const TQString& ) ) ); @@ -199,11 +199,11 @@ void FileTreeWidget::slotItemExecuted( TQListViewItem* item ) /////////////////////////////////////////////////////////////////////////////// -void FileTreeWidget::slotContextMenu( KListView *, TQListViewItem* item, const TQPoint &p ) +void FileTreeWidget::slotContextMenu( TDEListView *, TQListViewItem* item, const TQPoint &p ) { kdDebug(9017) << "FileTreeWidget::slotContextMenu(...)" << endl; - KPopupMenu popup( this ); + TDEPopupMenu popup( this ); popup.insertTitle( i18n("File Tree") ); // If an item is selected, fill the file context with selected files' list diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h index 5d844aa5..d43da13f 100644 --- a/parts/fileview/filetreewidget.h +++ b/parts/fileview/filetreewidget.h @@ -72,7 +72,7 @@ public slots: private slots: void slotItemExecuted(TQListViewItem *item); - void slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p); + void slotContextMenu(TDEListView *, TQListViewItem *item, const TQPoint &p); void changeActiveDirectory( const TQString&, const TQString& ); void finishPopulate(KFileTreeViewItem* item); diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index 780ccf9f..a644c9d1 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -203,14 +203,14 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFil // Harakiri itself if the infoProvider object is destroyed since we cannot work anymore :-( connect( m_vcsInfoProvider, TQT_SIGNAL(destroyed()), TQT_SIGNAL(implementationInvalidated()) ); - m_actionToggleShowVCSFields = new KToggleAction( i18n("Show VCS Fields"), KShortcut(), + m_actionToggleShowVCSFields = new TDEToggleAction( i18n("Show VCS Fields"), TDEShortcut(), this, "actiontoggleshowvcsfieldstoggleaction" ); m_actionToggleShowVCSFields->setCheckedState(i18n("Hide VCS Fields")); TQString aboutAction = i18n("<b>Show VCS fields</b><p>Shows <b>Revision</b> and <b>Timestamp</b> for each file contained in VCS repository."); m_actionToggleShowVCSFields->setWhatsThis( aboutAction ); connect( m_actionToggleShowVCSFields, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotToggleShowVCSFields(bool)) ); - m_actionSyncWithRepository = new KAction( i18n( "Sync with Repository"), KShortcut(), + m_actionSyncWithRepository = new TDEAction( i18n( "Sync with Repository"), TDEShortcut(), this, TQT_SLOT(slotSyncWithRepository()), this, "actionsyncwithrepository" ); aboutAction = i18n("<b>Sync with repository</b><p>Synchronize file status with remote repository."); m_actionSyncWithRepository->setWhatsThis( aboutAction ); diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h index ac8a9d54..00a38b32 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.h +++ b/parts/fileview/vcsfiletreewidgetimpl.h @@ -15,8 +15,8 @@ #include "filetreeviewwidgetimpl.h" class KDevVCSFileInfoProvider; -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; /** * @author Mario Scalas @@ -56,8 +56,8 @@ private slots: private: bool showVCSFields() const; - KToggleAction *m_actionToggleShowVCSFields; - KAction *m_actionSyncWithRepository; + TDEToggleAction *m_actionToggleShowVCSFields; + TDEAction *m_actionSyncWithRepository; KDevVCSFileInfoProvider *m_vcsInfoProvider; //! We use this guard to avoid enabling the "reload tree" action when performing //! syncing with remote repositories. diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp index aa10c559..69fc82eb 100644 --- a/parts/filter/filterpart.cpp +++ b/parts/filter/filterpart.cpp @@ -35,15 +35,15 @@ FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) setInstance(FilterFactory::instance()); setXMLFile("kdevfilter.rc"); - KAction *action; + TDEAction *action; - action = new KAction( i18n("Execute Command..."), 0, + action = new TDEAction( i18n("Execute Command..."), 0, this, TQT_SLOT(slotShellInsert()), actionCollection(), "tools_insertshell" ); action->setToolTip(i18n("Execute shell command")); action->setWhatsThis(i18n("<b>Execute shell command</b><p>Executes a shell command and outputs its result into the current document.")); - action = new KAction( i18n("Filter Selection Through Command..."), 0, + action = new TDEAction( i18n("Filter Selection Through Command..."), 0, this, TQT_SLOT(slotShellFilter()), actionCollection(), "tools_filtershell" ); action->setToolTip(i18n("Filter selection through a shell command")); diff --git a/parts/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h index 16b74733..8645f991 100644 --- a/parts/fullscreen/fullscreen_part.h +++ b/parts/fullscreen/fullscreen_part.h @@ -15,7 +15,7 @@ #include <tqguardedptr.h> #include <kdevplugin.h> -class KAction; +class TDEAction; class FullScreenPart : public KDevPlugin { @@ -29,7 +29,7 @@ public slots: void slotToggleFullScreen(); private: - KToggleFullScreenAction* m_pFullScreen; + TDEToggleFullScreenAction* m_pFullScreen; bool m_bFullScreen; }; diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp index 7b2822ec..627d7447 100644 --- a/parts/grepview/grepviewpart.cpp +++ b/parts/grepview/grepviewpart.cpp @@ -60,9 +60,9 @@ GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringLi mainWindow()->embedOutputView(m_widget, i18n("Find in Files"), i18n("Output of the grep command")); - KAction *action; + TDEAction *action; - action = new KAction(i18n("Find in Fi&les..."), "grep", CTRL+ALT+Key_F, + action = new TDEAction(i18n("Find in Fi&les..."), "grep", CTRL+ALT+Key_F, this, TQT_SLOT(slotGrep()), actionCollection(), "edit_grep"); action->setToolTip( i18n("Search for expressions over several files") ); diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp index 65ddf9e3..acace1b7 100644 --- a/parts/grepview/grepviewwidget.cpp +++ b/parts/grepview/grepviewwidget.cpp @@ -440,9 +440,9 @@ void GrepViewWidget::popupMenu(TQListBoxItem*, const TQPoint& p) { if(m_curOutput->isRunning()) return; - KPopupMenu rmbMenu; + TDEPopupMenu rmbMenu; - if(KAction *findAction = m_part->actionCollection()->action("edit_grep")) + if(TDEAction *findAction = m_part->actionCollection()->action("edit_grep")) { rmbMenu.insertTitle(i18n("Find in Files")); findAction->plug(&rmbMenu); diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp index 321b1db7..b8f5e552 100644 --- a/parts/openwith/openwithpart.cpp +++ b/parts/openwith/openwithpart.cpp @@ -47,7 +47,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) popup->insertItem( i18n("Open as UTF-8"), this, TQT_SLOT(openAsUtf8()) ); - KPopupMenu * openAsPopup = new KPopupMenu( popup ); + TDEPopupMenu * openAsPopup = new TDEPopupMenu( popup ); int id = popup->insertItem( i18n("Open As"), openAsPopup ); popup->setWhatsThis(id, i18n("<b>Open As</b><p>Lists all encodings that can be used to open the selected file.")); @@ -63,7 +63,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) i++; } - KPopupMenu * openWithPopup = new KPopupMenu( popup ); + TDEPopupMenu * openWithPopup = new TDEPopupMenu( popup ); // hmmm.. what to do here? open every different mimetype seperately? Just go with the first for now.. TQString mimeType = KMimeType::findByURL(m_urls.first(), 0, true, true)->name(); @@ -73,7 +73,7 @@ void OpenWithPart::fillContextMenu(TQPopupMenu *popup, const Context *context) TDETrader::OfferList::Iterator it; for (it = offers.begin(); it != offers.end(); ++it) { - KAction *action = new KAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName( (*it)->desktopEntryPath() ).data()); + TDEAction *action = new TDEAction((*it)->name(), (*it)->icon(), 0, 0, TQFile::encodeName( (*it)->desktopEntryPath() ).data()); connect(action, TQT_SIGNAL(activated()), this, TQT_SLOT(openWithService())); action->plug( openWithPopup ); } diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index 6c7f525a..d6aa0856 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -249,7 +249,7 @@ void AppOutputWidget::clearFilter() void AppOutputWidget::slotContextMenu( TQListBoxItem *, const TQPoint &p ) { - KPopupMenu popup(this, "filter output"); + TDEPopupMenu popup(this, "filter output"); int id = popup.insertItem( i18n("Clear output"), this, TQT_SLOT(clearViewAndContents()) ); popup.setItemEnabled( id, m_contentList.size() > 0 ); diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index 9185e5fd..cc8d356c 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -51,12 +51,12 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis mainWindow()->embedOutputView(m_widget, i18n("Messages"), i18n("Compiler output messages")); - KAction *action; - action = new KAction( i18n("&Next Error"), Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(nextError()), + TDEAction *action; + action = new TDEAction( i18n("&Next Error"), Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(nextError()), actionCollection(), "view_next_error"); action->setToolTip( i18n("Go to the next error") ); action->setWhatsThis(i18n("<b>Next error</b><p>Switches to the file and line where the next error was reported from.")); - action = new KAction( i18n("&Previous Error"), SHIFT+Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(prevError()), + action = new TDEAction( i18n("&Previous Error"), SHIFT+Key_F4, TQT_TQOBJECT(m_widget), TQT_SLOT(prevError()), actionCollection(), "view_previous_error"); action->setToolTip( i18n("Go to the previous error") ); action->setWhatsThis(i18n("<b>Previous error</b><p>Switches to the file and line where the previous error was reported from.")); diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp index bf2c9ddc..b0bd82b1 100644 --- a/parts/partexplorer/partexplorer_plugin.cpp +++ b/parts/partexplorer/partexplorer_plugin.cpp @@ -40,7 +40,7 @@ PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, con m_widget = new PartExplorerForm( mainWindow()->main() ); // mainWindow()->embedSelectView( m_widget, i18n("PartExplorer"), i18n("Query system services")); - KAction *action = new KAction( i18n("&Part Explorer"), 0, this, TQT_SLOT(slotShowForm()), + TDEAction *action = new TDEAction( i18n("&Part Explorer"), 0, this, TQT_SLOT(slotShowForm()), actionCollection(), "show_partexplorerform" ); action->setToolTip(i18n("TDETrader query execution")); action->setWhatsThis(i18n("<b>Part explorer</b><p>Shows a dialog for TDETrader query execution. Search your TDE documentation for more information about TDE services and TDETrader.")); diff --git a/parts/partexplorer/partexplorerform.cpp b/parts/partexplorer/partexplorerform.cpp index b7e970cf..8cff1f57 100644 --- a/parts/partexplorer/partexplorerform.cpp +++ b/parts/partexplorer/partexplorerform.cpp @@ -32,12 +32,12 @@ /////////////////////////////////////////////////////////////////////////////// namespace PartExplorer{ -class PropertyItem : public KListViewItem +class PropertyItem : public TDEListViewItem { public: - PropertyItem( KListViewItem *parent, const TQString &propertyName, + PropertyItem( TDEListViewItem *parent, const TQString &propertyName, const TQString &propertyType, const TQString &propertyValue ) - : KListViewItem( parent ) + : TDEListViewItem( parent ) { setText( 0, propertyName ); setText( 1, propertyType ); @@ -68,11 +68,11 @@ private: ResultsList* m_resultsList; }; -class ResultsList : public KListView +class ResultsList : public TDEListView { public: ResultsList( TQWidget *parent ) - : KListView( parent, "resultslist" ) + : TDEListView( parent, "resultslist" ) { this->setShowToolTips( false ); new ResultsToolTip( this ); @@ -82,7 +82,7 @@ public: void clear() { - KListView::clear(); + TDEListView::clear(); } }; @@ -197,13 +197,13 @@ void PartExplorerForm::fillServiceList( const TDETrader::OfferList &services ) this->m_resultsList->setRootIsDecorated( true ); - KListViewItem *rootItem = 0; + TDEListViewItem *rootItem = 0; TDETrader::OfferList::ConstIterator it = services.begin(); for ( ; it != services.end(); ++it ) { KService::Ptr service = (*it); - KListViewItem *serviceItem = new KListViewItem( this->m_resultsList, rootItem, service->name() ); + TDEListViewItem *serviceItem = new TDEListViewItem( this->m_resultsList, rootItem, service->name() ); TQStringList propertyNames = service->propertyNames(); for ( TQStringList::const_iterator it = propertyNames.begin(); it != propertyNames.end(); ++it ) diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index cd95f64a..ae8bae82 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -55,22 +55,22 @@ QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringL setInstance(QuickOpenFactory::instance()); setXMLFile("kdevpart_quickopen.rc"); - m_actionQuickOpen = new KAction( i18n("Quick Open File..."), CTRL + ALT + Key_O, + m_actionQuickOpen = new TDEAction( i18n("Quick Open File..."), CTRL + ALT + Key_O, this, TQT_SLOT(slotQuickFileOpen()), actionCollection(), "quick_open" ); m_actionQuickOpen->setToolTip(i18n("Quick open file in project")); m_actionQuickOpen->setWhatsThis(i18n("<b>Quick open</b><p>Provides a file name input form with completion listbox to quickly open file in a project.")); - m_actionQuickOpenClass = new KAction( i18n("Quick Open Class..."), CTRL + ALT + Key_C, + m_actionQuickOpenClass = new TDEAction( i18n("Quick Open Class..."), CTRL + ALT + Key_C, this, TQT_SLOT(slotQuickOpenClass()), actionCollection(), "quick_open_class" ); m_actionQuickOpenClass->setToolTip(i18n("Find class in project")); m_actionQuickOpenClass->setWhatsThis(i18n("<b>Find class</b><p>Provides a class name input form with completion listbox to quickly open a file where the class is defined.")); - m_actionFunctionOpen = new KAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, TQT_SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); + m_actionFunctionOpen = new TDEAction( i18n("Quick Open Method..."), CTRL + ALT + Key_M, this, TQT_SLOT(slotQuickOpenFunction()), actionCollection(), "quick_open_function" ); m_actionFunctionOpen->setToolTip(i18n("Quick open function in project")); - m_switchToAction = new KAction(i18n("Switch To..."), KShortcut("CTRL+/"), this, TQT_SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); + m_switchToAction = new TDEAction(i18n("Switch To..."), TDEShortcut("CTRL+/"), this, TQT_SLOT(slotSwitchTo()), actionCollection(), "file_switchto"); m_switchToAction->setToolTip(i18n("Switch to")); m_switchToAction->setWhatsThis(i18n("<b>Switch to</b><p>Prompts to enter the name of previously opened file to switch to.")); diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h index 304a78ae..b8c8460b 100644 --- a/parts/quickopen/quickopen_part.h +++ b/parts/quickopen/quickopen_part.h @@ -25,7 +25,7 @@ #include <kdevquickopen.h> #include <codemodel.h> -class KAction; +class TDEAction; class QuickOpenPart : public KDevQuickOpen { @@ -48,10 +48,10 @@ private slots: void slotSwitchTo(); private: - KAction* m_actionQuickOpen; - KAction* m_actionQuickOpenClass; - KAction* m_actionFunctionOpen; - KAction* m_switchToAction; + TDEAction* m_actionQuickOpen; + TDEAction* m_actionQuickOpenClass; + TDEAction* m_actionFunctionOpen; + TDEAction* m_switchToAction; }; diff --git a/parts/quickopen/quickopenbase.ui b/parts/quickopen/quickopenbase.ui index 1f3dcdb4..1b29104a 100644 --- a/parts/quickopen/quickopenbase.ui +++ b/parts/quickopen/quickopenbase.ui @@ -44,7 +44,7 @@ <cstring>itemList</cstring> </property> </widget> - <widget class="KListBox" row="3" column="0"> + <widget class="TDEListBox" row="3" column="0"> <property name="name"> <cstring>itemList</cstring> </property> diff --git a/parts/quickopen/quickopenfunctionchooseformbase.ui b/parts/quickopen/quickopenfunctionchooseformbase.ui index 2661c684..f4bae80b 100644 --- a/parts/quickopen/quickopenfunctionchooseformbase.ui +++ b/parts/quickopen/quickopenfunctionchooseformbase.ui @@ -86,7 +86,7 @@ <string>File name:</string> </property> </widget> - <widget class="KListBox"> + <widget class="TDEListBox"> <property name="name"> <cstring>fileBox</cstring> </property> @@ -142,7 +142,7 @@ <string>Function arguments list:</string> </property> </widget> - <widget class="KListBox"> + <widget class="TDEListBox"> <property name="name"> <cstring>argBox</cstring> </property> diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp index 511e6be0..b671542e 100644 --- a/parts/regexptest/regexptestpart.cpp +++ b/parts/regexptest/regexptestpart.cpp @@ -30,9 +30,9 @@ RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStrin setInstance(RegexpTestFactory::instance()); setXMLFile("kdevregexptest.rc"); - KAction *action; + TDEAction *action; - action = new KAction( i18n("Debug Regular Expression..."), 0, + action = new TDEAction( i18n("Debug Regular Expression..."), 0, this, TQT_SLOT(slotRegexpTest()), actionCollection(), "tools_regexptest" ); action->setToolTip(i18n("Debug regular expression")); diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index 7a64cac8..857c6696 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -52,7 +52,7 @@ ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& mainWindow()->embedOutputView( m_widget, i18n("Replace"), i18n("Project wide string replacement") ); mainWindow()->setViewAvailable( m_widget, false ); - action = new KAction(i18n("Find-Select-Replace..."), 0, + action = new TDEAction(i18n("Find-Select-Replace..."), 0, CTRL+SHIFT+Key_R, this, TQT_SLOT(slotReplace()), actionCollection(), "edit_replace_across"); action->setToolTip( i18n("Project wide string replacement") ); action->setWhatsThis( i18n("<b>Find-Select-Replace</b><p>" diff --git a/parts/replace/replace_part.h b/parts/replace/replace_part.h index d6f79d98..fbd0f2f7 100644 --- a/parts/replace/replace_part.h +++ b/parts/replace/replace_part.h @@ -19,7 +19,7 @@ class ReplaceWidget; -class KAction; +class TDEAction; class Context; class ReplacePart : public KDevPlugin @@ -39,7 +39,7 @@ public slots: private: TQGuardedPtr<ReplaceWidget> m_widget; TQString m_popupstr; - KAction* action; + TDEAction* action; }; diff --git a/parts/replace/replaceview.cpp b/parts/replace/replaceview.cpp index a7cc78ca..a85b0818 100644 --- a/parts/replace/replaceview.cpp +++ b/parts/replace/replaceview.cpp @@ -27,7 +27,7 @@ ReplaceItem * ReplaceView::firstChild() const } -ReplaceView::ReplaceView( TQWidget * parent ) : KListView( parent ), _latestfile( 0 ) +ReplaceView::ReplaceView( TQWidget * parent ) : TDEListView( parent ), _latestfile( 0 ) { setSorting( -1 ); addColumn( "" ); diff --git a/parts/replace/replaceview.h b/parts/replace/replaceview.h index 5ed706a6..f70e41c0 100644 --- a/parts/replace/replaceview.h +++ b/parts/replace/replaceview.h @@ -21,7 +21,7 @@ class TQTextStream; class TQWidget; class ReplaceItem; -class ReplaceView : public KListView +class ReplaceView : public TDEListView { Q_OBJECT diff --git a/parts/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h index 24d17104..832318b9 100644 --- a/parts/scripting/scriptingpart.h +++ b/parts/scripting/scriptingpart.h @@ -26,7 +26,7 @@ #include <tqguardedptr.h> class TQPopupMenu; -class KAction; +class TDEAction; class KDialogBase; class Context; class ConfigWidgetProxy; diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index 0d39038e..e16f7821 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -73,7 +73,7 @@ SnippetPart::~SnippetPart() void SnippetPart::setupActions() { - new KAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, TQT_SLOT(slotShowView()), actionCollection(), "snippet_showview"); + new TDEAction( i18n("Show Snippet Tree"), CTRL+ALT+SHIFT+Key_S, this, TQT_SLOT(slotShowView()), actionCollection(), "snippet_showview"); } /*! diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 447193f4..dd057a29 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -47,13 +47,13 @@ #include "snippet_widget.h" SnippetWidget::SnippetWidget(SnippetPart *part) - : KListView(0, "snippet widget"), TQToolTip( viewport() ), + : TDEListView(0, "snippet widget"), TQToolTip( viewport() ), m_part( part ) { // init the TQPtrList _list.setAutoDelete(TRUE); - // init the KListView + // init the TDEListView setSorting( -1 ); addColumn( "" ); setFullWidth(true); @@ -213,7 +213,7 @@ void SnippetWidget::slotEdit() dlg.cbGroup->setCurrentText(SnippetItem::findGroupById(pSnippet->getParent(), _list)->getName()); if (dlg.exec() == TQDialog::Accepted) { - //update the KListView and the SnippetItem + //update the TDEListView and the SnippetItem item->setText( 0, dlg.snippetName->text() ); pSnippet->setName( dlg.snippetName->text() ); pSnippet->setText( dlg.snippetText->text() ); @@ -256,7 +256,7 @@ void SnippetWidget::slotEditGroup() dlg.textLabelGroup->setText(i18n("Language:")); if (dlg.exec() == TQDialog::Accepted) { - //update the KListView and the SnippetGroup + //update the TDEListView and the SnippetGroup item->setText( 0, dlg.snippetName->text() ); pGroup->setName( dlg.snippetName->text() ); pGroup->setLanguage(dlg.cbGroup->currentText()); @@ -545,7 +545,7 @@ void SnippetWidget::maybeTip( const TQPoint & p ) */ void SnippetWidget::showPopupMenu( TQListViewItem * item, const TQPoint & p, int ) { - KPopupMenu popup; + TDEPopupMenu popup; SnippetItem * selectedItem = static_cast<SnippetItem *>(item); if ( item ) { @@ -882,7 +882,7 @@ TQString SnippetWidget::showSingleVarDialog(TQString var, TQMap<TQString, TQStri // fn SnippetWidget::acceptDrag (TQDropEvent *event) const /*! - Reimplementation from KListView. + Reimplementation from TDEListView. Check here if the data the user is about to drop fits our restrictions. We only accept dropps of plaintext, because from the dropped text we will create a snippet. diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h index 29bb1dc9..bce03e17 100644 --- a/parts/snippet/snippet_widget.h +++ b/parts/snippet/snippet_widget.h @@ -22,7 +22,7 @@ class KDevProject; class SnippetPart; class TQPushButton; -class KListView; +class TDEListView; class TQListViewItem; class TQPoint; class SnippetDlg; @@ -33,11 +33,11 @@ class TDEConfig; /** This is the widget which gets added to the right TreeToolView. -It inherits KListView and TQToolTip which is needed for showing the +It inherits TDEListView and TQToolTip which is needed for showing the tooltips which contains the text of the snippet @author Robert Gruber */ -class SnippetWidget : public KListView, public TQToolTip +class SnippetWidget : public TDEListView, public TQToolTip { Q_OBJECT diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index f655511f..2bc1299a 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -58,7 +58,7 @@ public: TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *parent, const char *name) - : KListView(parent, name) + : TDEListView(parent, name) { setResizeMode(TQListView::LastColumn); setSorting(-1); @@ -74,8 +74,8 @@ TextToolsWidget::TextToolsWidget(TextToolsPart *part, TQWidget *parent, const ch // this, TQT_SLOT(slotItemPressed(int,TQListViewItem*)) ); connect( this, TQT_SIGNAL(returnPressed(TQListViewItem*)), this, TQT_SLOT(slotReturnPressed(TQListViewItem*)) ); - connect( this, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( this, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } @@ -148,13 +148,13 @@ void TextToolsWidget::slotReturnPressed(TQListViewItem *item) } -void TextToolsWidget::slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &) +void TextToolsWidget::slotContextMenu(TDEListView *, TQListViewItem *item, const TQPoint &) { if (!item) return; #if 0 - KPopupMenu popup(i18n("Text Structure"), this); + TDEPopupMenu popup(i18n("Text Structure"), this); popup.exec(p); #endif } diff --git a/parts/texttools/texttoolswidget.h b/parts/texttools/texttoolswidget.h index 6428e522..2e3c274a 100644 --- a/parts/texttools/texttoolswidget.h +++ b/parts/texttools/texttoolswidget.h @@ -21,7 +21,7 @@ namespace KParts { class Part; } namespace KTextEditor { class EditInterface; } -class TextToolsWidget : public KListView +class TextToolsWidget : public TDEListView { Q_OBJECT @@ -38,7 +38,7 @@ public: private slots: void slotItemPressed(int button, TQListViewItem *item); void slotReturnPressed(TQListViewItem *item); - void slotContextMenu(KListView *, TQListViewItem *item, const TQPoint &p); + void slotContextMenu(TDEListView *, TQListViewItem *item, const TQPoint &p); void startTimer(); void parseXML(); diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index 774df47c..e116e948 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -31,9 +31,9 @@ TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringLis setXMLFile("kdevpart_tipofday.rc"); - KAction *action; + TDEAction *action; - action = new KAction(i18n("&Tip of the Day"), "idea", 0, + action = new TDEAction(i18n("&Tip of the Day"), "idea", 0, this, TQT_SLOT(showTip()), actionCollection(), "help_tipofday"); action->setToolTip(i18n("A tip how to use TDevelop")); action->setWhatsThis(i18n("<b>Tip of the day</b><p>" diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index 287e5b40..d035a185 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -65,7 +65,7 @@ template class TQPtrList<TQString>; // ---------------------------------------------------------------------- -KDevAppTreeListItem::KDevAppTreeListItem( KListView* parent, const TQString & name, +KDevAppTreeListItem::KDevAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ) : TQListViewItem( parent, name ) { @@ -132,7 +132,7 @@ bool KDevAppTreeListItem::isDirectory() // ---------------------------------------------------------------------- KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name ) - : KListView( parent, name ), currentitem(0) + : TDEListView( parent, name ), currentitem(0) { addColumn( i18n("Known Applications") ); setRootIsDecorated( true ); @@ -249,7 +249,7 @@ void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i) void KDevApplicationTree::resizeEvent( TQResizeEvent * e) { setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)); - KListView::resizeEvent(e); + TDEListView::resizeEvent(e); } diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h index 4e76dab8..864ab1a0 100644 --- a/parts/tools/kapplicationtree.h +++ b/parts/tools/kapplicationtree.h @@ -50,7 +50,7 @@ protected: void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry); public: - KDevAppTreeListItem( KListView* parent, const TQString & name, const TQPixmap& pixmap, + KDevAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ); KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ); @@ -71,7 +71,7 @@ protected: /** * @internal */ -class KDevApplicationTree : public KListView +class KDevApplicationTree : public TDEListView { Q_OBJECT diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index 28af7745..50ff0230 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -86,7 +86,7 @@ void ToolsPart::insertConfigWidget( const KDialogBase * dlg, TQWidget * page, un void ToolsPart::updateMenu() { - TQPtrList<KAction> actions; + TQPtrList<TDEAction> actions; unplugActionList("tools_list"); @@ -102,7 +102,7 @@ void ToolsPart::updateMenu() if (df.readName().isNull()) continue; - KAction *action = new KAction(df.readName(), df.readIcon(), 0, + TDEAction *action = new TDEAction(df.readName(), df.readIcon(), 0, this, TQT_SLOT(slotToolActivated()), (TQObject*)0, name.latin1()); actions.append(action); } @@ -172,14 +172,14 @@ void ToolsPart::updateToolsMenu() TQStringList l = config->readListEntry("Tool Menu"); - TQPtrList<KAction> actions; + TQPtrList<TDEAction> actions; TQStringList::ConstIterator it; for (it = l.begin(); it != l.end(); ++it) { TQString menutext = *it; TDEConfig *config = ToolsFactory::instance()->config(); config->setGroup("Tool Menu " + menutext); bool isdesktopfile = config->readBoolEntry("DesktopFile"); - KAction *action = new KAction(*it, 0, + TDEAction *action = new TDEAction(*it, 0, this, TQT_SLOT(toolsMenuActivated()), (TQObject*) 0, menutext.utf8()); if (isdesktopfile) { diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index aa530e95..aece8c06 100644 --- a/parts/valgrind/valgrind_part.cpp +++ b/parts/valgrind/valgrind_part.cpp @@ -58,12 +58,12 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi "mismatched use of malloc/new/new [] vs free/delete/delete []<br>" "some abuses of the POSIX pthread API." ) ); - KAction* action = new KAction( i18n("&Valgrind Memory Leak Check"), 0, this, + TDEAction* action = new TDEAction( i18n("&Valgrind Memory Leak Check"), 0, this, TQT_SLOT(slotExecValgrind()), actionCollection(), "tools_valgrind" ); action->setToolTip(i18n("Valgrind memory leak check")); action->setWhatsThis(i18n("<b>Valgrind memory leak check</b><p>Runs Valgrind - a tool to help you find memory-management problems in your programs.")); - action = new KAction( i18n("P&rofile with KCachegrind"), 0, this, + action = new TDEAction( i18n("P&rofile with KCachegrind"), 0, this, TQT_SLOT(slotExecCalltree()), actionCollection(), "tools_calltree" ); action->setToolTip(i18n("Profile with KCachegrind")); action->setWhatsThis(i18n("<b>Profile with KCachegrind</b><p>Runs your program in calltree and then displays profiler information in KCachegrind.")); diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp index e3d36291..07fd2123 100644 --- a/parts/valgrind/valgrind_widget.cpp +++ b/parts/valgrind/valgrind_widget.cpp @@ -91,7 +91,7 @@ ValgrindWidget::ValgrindWidget( ValgrindPart *part ) : TQWidget(0, "valgrind widget"), _part( part ) { TQVBoxLayout* vbl = new TQVBoxLayout( this ); - lv = new KListView( this ); + lv = new TDEListView( this ); lv->addColumn( i18n( "No." ) ); lv->addColumn( i18n( "Thread" ) ); lv->addColumn( i18n( "Message" ) ); @@ -110,8 +110,8 @@ ValgrindWidget::ValgrindWidget( ValgrindPart *part ) this, TQT_SLOT(aboutToShowPopup()) ); connect( lv, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(executed(TQListViewItem*)) ); - connect( lv, TQT_SIGNAL(contextMenu(KListView*, TQListViewItem*, const TQPoint&)), - this, TQT_SLOT(slotContextMenu(KListView*, TQListViewItem*, const TQPoint&)) ); + connect( lv, TQT_SIGNAL(contextMenu(TDEListView*, TQListViewItem*, const TQPoint&)), + this, TQT_SLOT(slotContextMenu(TDEListView*, TQListViewItem*, const TQPoint&)) ); } @@ -194,7 +194,7 @@ void ValgrindWidget::aboutToShowPopup() popup->setItemEnabled( 3, en ); } -void ValgrindWidget::slotContextMenu( KListView* l, TQListViewItem* /*i*/, const TQPoint& p ) +void ValgrindWidget::slotContextMenu( TDEListView* l, TQListViewItem* /*i*/, const TQPoint& p ) { if ( l != lv ) return; diff --git a/parts/valgrind/valgrind_widget.h b/parts/valgrind/valgrind_widget.h index ad1660ad..bb525758 100644 --- a/parts/valgrind/valgrind_widget.h +++ b/parts/valgrind/valgrind_widget.h @@ -8,7 +8,7 @@ #include "valgrinditem.h" class ValgrindPart; -class KListView; +class TDEListView; class TQListViewItem; class TQPopupMenu; @@ -29,13 +29,13 @@ signals: private slots: void executed( TQListViewItem* item ); - void slotContextMenu( KListView* l, TQListViewItem* i, const TQPoint& p ); + void slotContextMenu( TDEListView* l, TQListViewItem* i, const TQPoint& p ); void expandAll(); void collapseAll(); void aboutToShowPopup(); private: - KListView* lv; + TDEListView* lv; int msgNumber; ValgrindPart* _part; TQPopupMenu* popup; diff --git a/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h index ce1aee4f..1fbccbff 100644 --- a/parts/vcsmanager/vcsmanagerpart.h +++ b/parts/vcsmanager/vcsmanagerpart.h @@ -26,7 +26,7 @@ #include <tqguardedptr.h> class TQPopupMenu; -class KAction; +class TDEAction; class KDialogBase; class Context; class ConfigWidgetProxy; diff --git a/src/core.cpp b/src/core.cpp index 7d937d16..0fc882f9 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -38,9 +38,9 @@ void Core::setupShourtcutTips(KXMLGUIClient * client) clients = TopLevel::getInstance()->main()->guiFactory()->clients(); for( TQPtrListIterator<KXMLGUIClient> it(clients); it.current(); ++it ) { - KActionCollection *actionCollection = (*it)->actionCollection(); + TDEActionCollection *actionCollection = (*it)->actionCollection(); for (int i = 0; i < actionCollection->count(); i++) { - KAction *action = actionCollection->action(i); + TDEAction *action = actionCollection->action(i); TQString tooltip = action->toolTip(); if (tooltip.isEmpty()) @@ -27,14 +27,14 @@ public: static Core *getInstance(); /** - * Setup shourtcut tips. For every KAction with a shortcut, + * Setup shourtcut tips. For every TDEAction with a shortcut, * appends the shortcut string, in parenthesis, to the * actions's tooltip. If tooltip already has any text in * parens, it's removed and shortcut is added instead. * * @param client * Pointer to KXMLGUIClient object, which contain an collection - * of actions (KActionCollection). If the parameter is null, + * of actions (TDEActionCollection). If the parameter is null, * function is applied to the all available KXMLGUIClient objects. */ static void setupShourtcutTips(KXMLGUIClient * client = 0); diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index c9d34e29..a7b7a995 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -45,9 +45,9 @@ EditorProxy::EditorProxy() m_delayedViewCreationCompatibleUI = true; - KAction *ac = new KAction( i18n("Show Context Menu"), 0, this, + TDEAction *ac = new TDEAction( i18n("Show Context Menu"), 0, this, TQT_SLOT(showPopup()), TopLevel::getInstance()->main()->actionCollection(), "show_popup" ); - KShortcut cut ;/*= KStdAccel::shortcut(KStdAccel::PopupMenuContext);*/ + TDEShortcut cut ;/*= TDEStdAccel::shortcut(TDEStdAccel::PopupMenuContext);*/ cut.append(KKey(CTRL+Key_Return)); ac->setShortcut(cut); } @@ -123,7 +123,7 @@ void EditorProxy::installPopup( KParts::Part * part ) return; } - KAction * action = NULL; + TDEAction * action = NULL; //If there is a tab for this file, we don't need to plug the closing menu entries here TDEConfig *config = TDEGlobal::config(); config->setGroup("UI"); diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 1b9f492f..a81d7b39 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -107,9 +107,9 @@ void MainWindowShare::createActions() KStdAction::quit(this->parent(), TQT_SLOT(close()), m_pMainWnd->actionCollection()); - KAction* action; + TDEAction* action; - m_stopProcesses = new KToolBarPopupAction( i18n( "&Stop" ), "stop", + m_stopProcesses = new TDEToolBarPopupAction( i18n( "&Stop" ), "stop", Key_Escape, this, TQT_SLOT(slotStopButtonPressed()), m_pMainWnd->actionCollection(), "stop_processes" ); m_stopProcesses->setToolTip(i18n("Stop")); @@ -157,25 +157,25 @@ void MainWindowShare::createActions() m_toggleStatusbar->setToolTip( i18n("Show statusbar") ); m_toggleStatusbar->setWhatsThis(i18n("<b>Show statusbar</b><p>Hides or shows the statusbar.")); - action = new KAction( i18n("&Next Window"), ALT+Key_Right, this, TQT_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); + action = new TDEAction( i18n("&Next Window"), ALT+Key_Right, this, TQT_SIGNAL(gotoNextWindow()),m_pMainWnd->actionCollection(), "view_next_window"); action->setToolTip( i18n("Next window") ); action->setWhatsThis(i18n("<b>Next window</b><p>Switches to the next window.")); - action = new KAction( i18n("&Previous Window"), ALT+Key_Left, this, TQT_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); + action = new TDEAction( i18n("&Previous Window"), ALT+Key_Left, this, TQT_SIGNAL(gotoPreviousWindow()),m_pMainWnd->actionCollection(), "view_previous_window"); action->setToolTip( i18n("Previous window") ); action->setWhatsThis(i18n("<b>Previous window</b><p>Switches to the previous window.")); - action = new KAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQT_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); + action = new TDEAction( i18n("&Last Accessed Window"), ALT+Key_Up, this, TQT_SIGNAL(gotoLastWindow()), m_pMainWnd->actionCollection(), "view_last_window"); action->setToolTip( i18n("Last accessed window") ); action->setWhatsThis(i18n("<b>Last accessed window</b><p>Switches to the last viewed window (Hold the Alt key pressed and walk on by repeating the Up key).")); - action = new KAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQT_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); + action = new TDEAction( i18n("&First Accessed Window"), ALT+Key_Down, this, TQT_SIGNAL(gotoFirstWindow()), m_pMainWnd->actionCollection(), "view_first_window"); action->setToolTip( i18n("First accessed window") ); action->setWhatsThis(i18n("<b>First accessed window</b><p>Switches to the first accessed window (Hold the Alt key pressed and walk on by repeating the Down key).")); - action = new KAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQT_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); + action = new TDEAction( i18n("Configure Plugins..."), SmallIconSet("configure"), 0, PluginController::getInstance(), TQT_SLOT(selectPlugins()), m_pMainWnd->actionCollection(), "settings_configure_plugins" ); - m_configureEditorAction = new KAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQT_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); + m_configureEditorAction = new TDEAction( i18n("Configure &Editor..."), SmallIconSet("configure"), 0, this, TQT_SLOT( slotConfigureEditors() ), m_pMainWnd->actionCollection(), "settings_configure_editors"); m_configureEditorAction->setToolTip( i18n("Configure editor settings") ); m_configureEditorAction->setWhatsThis(i18n("<b>Configure editor</b><p>Opens editor configuration dialog.")); m_configureEditorAction->setEnabled( false ); @@ -357,21 +357,21 @@ void MainWindowShare::slotGUICreated( KParts::Part * part ) m_configureEditorAction->setEnabled( true ); // remove the part's merged menu entry - KAction * action = part->action("set_confdlg"); // name from katepartui.rc + TDEAction * action = part->action("set_confdlg"); // name from katepartui.rc if ( action ) { kdDebug(9000) << " *** found \"set_confdlg\" action - unplugging" << endl; action->unplugAll(); } - if ( KAction * action = part->action("file_save") ) + if ( TDEAction * action = part->action("file_save") ) { kdDebug(9000) << " *** found \"file_save\" action - disconnecting" << endl; disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); connect( action, TQT_SIGNAL(activated()), PartController::getInstance(), TQT_SLOT(slotSave()) ); } - if ( KAction * action = part->action("file_reload") ) + if ( TDEAction * action = part->action("file_reload") ) { kdDebug(9000) << " *** found \"file_reload\" action - disconnecting" << endl; disconnect( action, TQT_SIGNAL(activated()), 0, 0 ); diff --git a/src/mainwindowshare.h b/src/mainwindowshare.h index f178b014..c10b9b0e 100644 --- a/src/mainwindowshare.h +++ b/src/mainwindowshare.h @@ -19,8 +19,8 @@ #include <tqobject.h> -class KAction; -class KToggleAction; +class TDEAction; +class TDEToggleAction; namespace KParts { class MainWindow; } @@ -72,15 +72,15 @@ private slots: void contextMenu(TQPopupMenu *, const Context *); private: - KToggleAction* m_toggleMainToolbar; - KToggleAction* m_toggleBuildToolbar; - KToggleAction* m_toggleViewToolbar; - KToggleAction* m_toggleBrowserToolbar; - KToggleAction* m_toggleStatusbar; + TDEToggleAction* m_toggleMainToolbar; + TDEToggleAction* m_toggleBuildToolbar; + TDEToggleAction* m_toggleViewToolbar; + TDEToggleAction* m_toggleBrowserToolbar; + TDEToggleAction* m_toggleStatusbar; - KAction * m_configureEditorAction; + TDEAction * m_configureEditorAction; - KToolBarPopupAction* m_stopProcesses; //!< Stops all running processes + TDEToolBarPopupAction* m_stopProcesses; //!< Stops all running processes KParts::MainWindow* m_pMainWnd; TQPtrList<KDevPlugin> activeProcesses; diff --git a/src/newui/button.cpp b/src/newui/button.cpp index fc6720f9..3ccefc94 100644 --- a/src/newui/button.cpp +++ b/src/newui/button.cpp @@ -55,9 +55,9 @@ Button::Button(ButtonBar *parent, const TQString text, const TQIconSet &icon, TQToolTip::add(this, m_realText); - m_assignAccelAction = new KAction(i18n("Assign Accelerator..."), 0, + m_assignAccelAction = new TDEAction(i18n("Assign Accelerator..."), 0, TQT_TQOBJECT(this), TQT_SLOT(assignAccel()), TQT_TQOBJECT(this)); - m_clearAccelAction = new KAction(i18n("Clear Accelerator"), 0, + m_clearAccelAction = new TDEAction(i18n("Clear Accelerator"), 0, TQT_TQOBJECT(this), TQT_SLOT(clearAccel()), TQT_TQOBJECT(this)); TDEConfig *config = kapp->config(); diff --git a/src/newui/button.h b/src/newui/button.h index 82dc6ee9..4d816788 100644 --- a/src/newui/button.h +++ b/src/newui/button.h @@ -25,7 +25,7 @@ #include "comdefs.h" -class KAction; +class TDEAction; namespace Ideal { @@ -98,8 +98,8 @@ private: TQString m_realText; TQIconSet m_realIconSet; - KAction *m_assignAccelAction; - KAction *m_clearAccelAction; + TDEAction *m_assignAccelAction; + TDEAction *m_clearAccelAction; friend class ButtonBar; }; diff --git a/src/newui/ddockwindow.cpp b/src/newui/ddockwindow.cpp index 091ad1c0..2b046b14 100644 --- a/src/newui/ddockwindow.cpp +++ b/src/newui/ddockwindow.cpp @@ -85,9 +85,9 @@ DDockWindow::DDockWindow(DMainWindow *parent, Position position) m_widgetStack = new TQWidgetStack(this); m_internalLayout->addWidget(m_widgetStack); - m_moveToDockLeft = new KAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); - m_moveToDockRight = new KAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); - m_moveToDockBottom = new KAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); + m_moveToDockLeft = new TDEAction( i18n("Move to left dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockLeft()), TQT_TQOBJECT(this) ); + m_moveToDockRight = new TDEAction( i18n("Move to right dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockRight()), TQT_TQOBJECT(this) ); + m_moveToDockBottom = new TDEAction( i18n("Move to bottom dock"), 0, TQT_TQOBJECT(this), TQT_SLOT(moveToDockBottom()), TQT_TQOBJECT(this) ); setVisible(m_visible); @@ -320,7 +320,7 @@ void DDockWindow::showWidget(TQWidget *widget) void DDockWindow::setMovingEnabled(bool) { - //some operations on KMainWindow cause moving to be enabled + //some operations on TDEMainWindow cause moving to be enabled //but we always don't want DDockWindow instances to be movable TQDockWindow::setMovingEnabled(false); } diff --git a/src/newui/ddockwindow.h b/src/newui/ddockwindow.h index fb6b0976..10727f22 100644 --- a/src/newui/ddockwindow.h +++ b/src/newui/ddockwindow.h @@ -29,7 +29,7 @@ class TQWidgetStack; class TQPopupMenu; class KComboBox; -class KAction; +class TDEAction; class DMainWindow; @@ -107,9 +107,9 @@ private: TQBoxLayout *m_internalLayout; - KAction * m_moveToDockLeft; - KAction * m_moveToDockRight; - KAction * m_moveToDockBottom; + TDEAction * m_moveToDockLeft; + TDEAction * m_moveToDockRight; + TDEAction * m_moveToDockBottom; }; #endif diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 083aeb2f..db615763 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -124,9 +124,9 @@ PartController *PartController::getInstance() void PartController::setupActions() { - KActionCollection *ac = TopLevel::getInstance()->main()->actionCollection(); + TDEActionCollection *ac = TopLevel::getInstance()->main()->actionCollection(); - KAction* newAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac, "file_open"); + TDEAction* newAction = KStdAction::open(this, TQT_SLOT(slotOpenFile()), ac, "file_open"); newAction->setToolTip( i18n("Open file") ); newAction->setWhatsThis( i18n("<b>Open file</b><p>Opens an existing file without adding it to the project.</p>") ); @@ -134,12 +134,12 @@ void PartController::setupActions() m_openRecentAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_openRecentAction->text())).arg(i18n("Opens recently opened file."))); m_openRecentAction->loadEntries( kapp->config(), "RecentFiles" ); - m_saveAllFilesAction = new KAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all"); + m_saveAllFilesAction = new TDEAction(i18n("Save Al&l"), 0, this, TQT_SLOT(slotSaveAllFiles()), ac, "file_save_all"); m_saveAllFilesAction->setToolTip( i18n("Save all modified files") ); m_saveAllFilesAction->setWhatsThis(i18n("<b>Save all</b><p>Saves all modified files.")); m_saveAllFilesAction->setEnabled(false); - m_revertAllFilesAction = new KAction(i18n("Rever&t All"), 0, this, TQT_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); + m_revertAllFilesAction = new TDEAction(i18n("Rever&t All"), 0, this, TQT_SLOT(slotRevertAllFiles()), ac, "file_revert_all"); m_revertAllFilesAction->setToolTip(i18n("Revert all changes")); m_revertAllFilesAction->setWhatsThis(i18n("<b>Revert all</b><p>Reverts all changes in opened files. Prompts to save changes so the reversion can be canceled for each modified file.")); m_revertAllFilesAction->setEnabled(false); @@ -149,33 +149,33 @@ void PartController::setupActions() m_closeWindowAction->setWhatsThis(TQString("<b>%1</b><p>%2").arg(beautifyToolTip(m_closeWindowAction->text())).arg(i18n("Closes current file."))); m_closeWindowAction->setEnabled(false); - m_closeAllWindowsAction = new KAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); + m_closeAllWindowsAction = new TDEAction(i18n("Close All"), 0, this, TQT_SLOT(slotCloseAllWindows()), ac, "file_close_all"); m_closeAllWindowsAction->setToolTip( i18n("Close all files") ); m_closeAllWindowsAction->setWhatsThis(i18n("<b>Close all</b><p>Close all opened files.")); m_closeAllWindowsAction->setEnabled(false); - m_closeOtherWindowsAction = new KAction(i18n("Close All Others"), 0, this, TQT_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); + m_closeOtherWindowsAction = new TDEAction(i18n("Close All Others"), 0, this, TQT_SLOT(slotCloseOtherWindows()), ac, "file_closeother"); m_closeOtherWindowsAction->setToolTip( i18n("Close other files") ); m_closeOtherWindowsAction->setWhatsThis(i18n("<b>Close all others</b><p>Close all opened files except current.")); m_closeOtherWindowsAction->setEnabled(false); - new KActionSeparator(ac, "dummy_separator"); + new TDEActionSeparator(ac, "dummy_separator"); - m_backAction = new KToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), ac, "history_back"); + m_backAction = new TDEToolBarPopupAction(i18n("Back"), "back", 0, this, TQT_SLOT(slotBack()), ac, "history_back"); m_backAction->setEnabled( false ); m_backAction->setToolTip(i18n("Back")); m_backAction->setWhatsThis(i18n("<b>Back</b><p>Moves backwards one step in the navigation history.")); connect(m_backAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotBackAboutToShow())); connect(m_backAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotBackPopupActivated(int))); - m_forwardAction = new KToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), ac, "history_forward"); + m_forwardAction = new TDEToolBarPopupAction(i18n("Forward"), "forward", 0, this, TQT_SLOT(slotForward()), ac, "history_forward"); m_forwardAction->setEnabled( false ); m_forwardAction->setToolTip(i18n("Forward")); m_forwardAction->setWhatsThis(i18n("<b>Forward</b><p>Moves forward one step in the navigation history.")); connect(m_forwardAction->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotForwardAboutToShow())); connect(m_forwardAction->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotForwardPopupActivated(int))); - m_gotoLastEditPosAction = new KAction( i18n("Goto Last Edit Position"), "bottom", 0, this, TQT_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); + m_gotoLastEditPosAction = new TDEAction( i18n("Goto Last Edit Position"), "bottom", 0, this, TQT_SLOT(gotoLastEditPos()), ac, "goto_last_edit_pos" ); m_gotoLastEditPosAction->setEnabled( false ); m_gotoLastEditPosAction->setToolTip( i18n("Goto Last Edit Position") ); m_gotoLastEditPosAction->setWhatsThis( i18n("<b>Goto Last Edit Position</b><p>Open the last edited file and position cursor at the point of edit") ); @@ -752,26 +752,26 @@ void PartController::integrateTextEditorPart(KTextEditor::Document* doc) if ( KTextEditor::View * view = dynamic_cast<KTextEditor::View*>( doc->widget() ) ) { - KActionCollection* c = view->actionCollection(); + TDEActionCollection* c = view->actionCollection(); // Be extra carefull, in case the part either don't provide those // action, or uses different shortcuts. - if (KAction* a = c->action("view_folding_markers")) + if (TDEAction* a = c->action("view_folding_markers")) { - if (a->shortcut() == KShortcut(Key_F9)) - a->setShortcut(KShortcut()); + if (a->shortcut() == TDEShortcut(Key_F9)) + a->setShortcut(TDEShortcut()); } - if (KAction* a = c->action("view_dynamic_word_wrap")) + if (TDEAction* a = c->action("view_dynamic_word_wrap")) { - if (a->shortcut() == KShortcut(Key_F10)) - a->setShortcut(KShortcut()); + if (a->shortcut() == TDEShortcut(Key_F10)) + a->setShortcut(TDEShortcut()); } - if (KAction* a = c->action("view_line_numbers")) + if (TDEAction* a = c->action("view_line_numbers")) { - if (a->shortcut() == KShortcut(Key_F11)) - a->setShortcut(KShortcut()); + if (a->shortcut() == TDEShortcut(Key_F11)) + a->setShortcut(TDEShortcut()); } } @@ -1619,7 +1619,7 @@ void PartController::slotForward() void PartController::slotBackAboutToShow() { - KPopupMenu *popup = m_backAction->popupMenu(); + TDEPopupMenu *popup = m_backAction->popupMenu(); popup->clear(); if ( m_backHistory.isEmpty()) return; @@ -1636,7 +1636,7 @@ void PartController::slotBackAboutToShow() void PartController::slotForwardAboutToShow( ) { - KPopupMenu * popup = m_forwardAction->popupMenu(); + TDEPopupMenu * popup = m_forwardAction->popupMenu(); popup->clear(); if ( m_forwardHistory.isEmpty() ) return; diff --git a/src/partcontroller.h b/src/partcontroller.h index edec5afc..2e621c38 100644 --- a/src/partcontroller.h +++ b/src/partcontroller.h @@ -30,9 +30,9 @@ namespace Kate { class Document; } class TQTabWidget; class TQPopupMenu; -class KAction; -class KToolBarPopupAction; -class KRecentFilesAction; +class TDEAction; +class TDEToolBarPopupAction; +class TDERecentFilesAction; class HTMLDocumentationPart; class HistoryEntry; class KDirWatch; @@ -178,14 +178,14 @@ private: static PartController *s_instance; - KAction *m_closeWindowAction, *m_saveAllFilesAction, *m_revertAllFilesAction; - KAction *m_closeAllWindowsAction, *m_closeOtherWindowsAction; - KRecentFilesAction *m_openRecentAction; + TDEAction *m_closeWindowAction, *m_saveAllFilesAction, *m_revertAllFilesAction; + TDEAction *m_closeAllWindowsAction, *m_closeOtherWindowsAction; + TDERecentFilesAction *m_openRecentAction; TQString m_presetEncoding; - KToolBarPopupAction* m_backAction; - KToolBarPopupAction* m_forwardAction; - KAction * m_gotoLastEditPosAction; + TDEToolBarPopupAction* m_backAction; + TDEToolBarPopupAction* m_forwardAction; + TDEAction * m_gotoLastEditPosAction; bool m_openNextAsText; diff --git a/src/profileengine/editor/profileeditor.cpp b/src/profileengine/editor/profileeditor.cpp index 7732ea90..c10aca8c 100644 --- a/src/profileengine/editor/profileeditor.cpp +++ b/src/profileengine/editor/profileeditor.cpp @@ -38,17 +38,17 @@ #include "addprofilewidget.h" -class ProfileItem: public KListViewItem { +class ProfileItem: public TDEListViewItem { public: - ProfileItem(KListView *parent, Profile *profile) - :KListViewItem(parent), m_profile(profile) + ProfileItem(TDEListView *parent, Profile *profile) + :TDEListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); } - ProfileItem(KListViewItem *parent, Profile *profile) - : KListViewItem(parent), m_profile(profile) + ProfileItem(TDEListViewItem *parent, Profile *profile) + : TDEListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); @@ -60,10 +60,10 @@ private: Profile *m_profile; }; -class EDListItem: public KListViewItem{ +class EDListItem: public TDEListViewItem{ public: - EDListItem(KListView *parent, const TQString &text, bool derived) - : KListViewItem(parent, text), m_derived(derived) + EDListItem(TDEListView *parent, const TQString &text, bool derived) + : TDEListViewItem(parent, text), m_derived(derived) { } @@ -74,7 +74,7 @@ public: TQColorGroup cgNew = cg; if (m_derived) cgNew.setColor(TQColorGroup::Text, TDEGlobalSettings::inactiveTextColor()); - KListViewItem::paintCell(p, cgNew, column, width, alignment); + TDEListViewItem::paintCell(p, cgNew, column, width, alignment); } private: @@ -134,22 +134,22 @@ void ProfileEditor::refreshAvailableList() { //filling a list of available plugins allList->clear(); - allCore = new KListViewItem(allList, i18n("Core")); + allCore = new TDEListViewItem(allList, i18n("Core")); allCore->setOpen(true); - allGlobal = new KListViewItem(allList, i18n("Global")); + allGlobal = new TDEListViewItem(allList, i18n("Global")); allGlobal->setOpen(true); - allProject = new KListViewItem(allList, i18n("Project")); + allProject = new TDEListViewItem(allList, i18n("Project")); allProject->setOpen(true); TDETrader::OfferList olist = engine.allOffers(ProfileEngine::Core); for (TDETrader::OfferList::iterator it = olist.begin(); it != olist.end(); ++it) - new KListViewItem(allCore, (*it)->desktopEntryName(), (*it)->genericName()); + new TDEListViewItem(allCore, (*it)->desktopEntryName(), (*it)->genericName()); olist = engine.allOffers(ProfileEngine::Global); for (TDETrader::OfferList::iterator it = olist.begin(); it != olist.end(); ++it) - new KListViewItem(allGlobal, (*it)->desktopEntryName(), (*it)->genericName()); + new TDEListViewItem(allGlobal, (*it)->desktopEntryName(), (*it)->genericName()); olist = engine.allOffers(ProfileEngine::Project); for (TDETrader::OfferList::iterator it = olist.begin(); it != olist.end(); ++it) - new KListViewItem(allProject, (*it)->desktopEntryName(), (*it)->genericName()); + new TDEListViewItem(allProject, (*it)->desktopEntryName(), (*it)->genericName()); } void ProfileEditor::profileExecuted(TQListViewItem *item) @@ -198,29 +198,29 @@ void ProfileEditor::fillPluginsList(Profile *profile) { pluginsView->clear(); - KListViewItem *core = new KListViewItem(pluginsView, i18n("Core Plugins")); + TDEListViewItem *core = new TDEListViewItem(pluginsView, i18n("Core Plugins")); core->setOpen(true); - KListViewItem *global = new KListViewItem(pluginsView, i18n("Global Plugins")); + TDEListViewItem *global = new TDEListViewItem(pluginsView, i18n("Global Plugins")); global->setOpen(true); - KListViewItem *project = new KListViewItem(pluginsView, i18n("Project Plugins")); + TDEListViewItem *project = new TDEListViewItem(pluginsView, i18n("Project Plugins")); project->setOpen(true); TDETrader::OfferList coreOffers = engine.offers(profile->name(), ProfileEngine::Core); for (TDETrader::OfferList::const_iterator it = coreOffers.constBegin(); it != coreOffers.constEnd(); ++it) - new KListViewItem(core, (*it)->desktopEntryName(), (*it)->genericName(), + new TDEListViewItem(core, (*it)->desktopEntryName(), (*it)->genericName(), (*it)->property("X-TDevelop-Properties").toStringList().join(", ")); TDETrader::OfferList globalOffers = engine.offers(profile->name(), ProfileEngine::Global); for (TDETrader::OfferList::const_iterator it = globalOffers.constBegin(); it != globalOffers.constEnd(); ++it) - new KListViewItem(global, (*it)->desktopEntryName(), (*it)->genericName(), + new TDEListViewItem(global, (*it)->desktopEntryName(), (*it)->genericName(), (*it)->property("X-TDevelop-Properties").toStringList().join(", ")); TDETrader::OfferList projectOffers = engine.offers(profile->name(), ProfileEngine::Project); for (TDETrader::OfferList::const_iterator it = projectOffers.constBegin(); it != projectOffers.constEnd(); ++it) - new KListViewItem(project, (*it)->desktopEntryName(), (*it)->genericName(), + new TDEListViewItem(project, (*it)->desktopEntryName(), (*it)->genericName(), (*it)->property("X-TDevelop-Properties").toStringList().join(", ")); } @@ -245,7 +245,7 @@ void ProfileEditor::addProfile() prof->genericNameEdit->text(), prof->descriptionEdit->text()); profilesList->currentItem()->setOpen(true); - new ProfileItem(static_cast<KListViewItem*>(profilesList->currentItem()), profile); + new ProfileItem(static_cast<TDEListViewItem*>(profilesList->currentItem()), profile); } } diff --git a/src/profileengine/editor/profileeditor.h b/src/profileengine/editor/profileeditor.h index ad5610f0..7c54ea71 100644 --- a/src/profileengine/editor/profileeditor.h +++ b/src/profileengine/editor/profileeditor.h @@ -25,7 +25,7 @@ class TQListBoxItem; class TQListViewItem; -class KListViewItem; +class TDEListViewItem; class ProfileEditor : public ProfileEditorBase { Q_OBJECT @@ -62,9 +62,9 @@ protected: private: ProfileEngine engine; - KListViewItem *allCore; - KListViewItem *allGlobal; - KListViewItem *allProject; + TDEListViewItem *allCore; + TDEListViewItem *allGlobal; + TDEListViewItem *allProject; }; #endif diff --git a/src/profileengine/editor/profileeditorbase.ui b/src/profileengine/editor/profileeditorbase.ui index 4c6af611..fc6b99f2 100644 --- a/src/profileengine/editor/profileeditorbase.ui +++ b/src/profileengine/editor/profileeditorbase.ui @@ -80,7 +80,7 @@ </size> </property> </spacer> - <widget class="KListView" row="0" column="0" rowspan="3" colspan="1"> + <widget class="TDEListView" row="0" column="0" rowspan="3" colspan="1"> <column> <property name="text"> <string>Name</string> @@ -212,7 +212,7 @@ <string>Derived properties:</string> </property> </widget> - <widget class="KListBox"> + <widget class="TDEListBox"> <property name="name"> <cstring>derivedPropertiesBox</cstring> </property> @@ -241,7 +241,7 @@ <string>Own properties:</string> </property> </widget> - <widget class="KListBox"> + <widget class="TDEListBox"> <property name="name"> <cstring>ownPropertiesBox</cstring> </property> @@ -283,7 +283,7 @@ <string>Enabled:</string> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Plugin Name</string> @@ -323,7 +323,7 @@ <string>Disabled:</string> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Plugin Name</string> @@ -430,7 +430,7 @@ <string>Available plugins:</string> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Name</string> @@ -510,7 +510,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="KListView" row="0" column="0"> + <widget class="TDEListView" row="0" column="0"> <column> <property name="text"> <string>Name</string> diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h index 4ea93bdf..0cf66d7d 100644 --- a/src/profileengine/lib/profileengine.h +++ b/src/profileengine/lib/profileengine.h @@ -206,17 +206,17 @@ public: } }; - class ProfileItem: public KListViewItem { + class ProfileItem: public TDEListViewItem { public: - ProfileItem(KListView *parent, Profile *profile) - :KListViewItem(parent), m_profile(profile) + ProfileItem(TDEListView *parent, Profile *profile) + :TDEListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); } - ProfileItem(KListViewItem *parent, Profile *profile) - : KListViewItem(parent), m_profile(profile) + ProfileItem(TDEListViewItem *parent, Profile *profile) + : TDEListViewItem(parent), m_profile(profile) { setText(0, profile->genericName()); setText(1, profile->description()); diff --git a/src/projectmanager.cpp b/src/projectmanager.cpp index 96e258e9..dbaa49c5 100644 --- a/src/projectmanager.cpp +++ b/src/projectmanager.cpp @@ -89,18 +89,18 @@ ProjectManager *ProjectManager::getInstance() return s_instance; } -void ProjectManager::createActions( KActionCollection* ac ) +void ProjectManager::createActions( TDEActionCollection* ac ) { - KAction *action; + TDEAction *action; - action = new KAction(i18n("&Open Project..."), "project_open", 0, + action = new TDEAction(i18n("&Open Project..."), "project_open", 0, this, TQT_SLOT(slotOpenProject()), ac, "project_open"); action->setToolTip( i18n("Open project")); action->setWhatsThis(i18n("<b>Open project</b><p>Opens a KDevelop3 or KDevelop2 project.")); m_openRecentProjectAction = - new KRecentFilesAction(i18n("Open &Recent Project"), 0, + new TDERecentFilesAction(i18n("Open &Recent Project"), 0, this, TQT_SLOT(loadProject(const KURL &)), ac, "project_open_recent"); m_openRecentProjectAction->setToolTip(i18n("Open recent project")); @@ -108,14 +108,14 @@ void ProjectManager::createActions( KActionCollection* ac ) m_openRecentProjectAction->loadEntries(kapp->config(), "RecentProjects"); m_closeProjectAction = - new KAction(i18n("C&lose Project"), "fileclose",0, + new TDEAction(i18n("C&lose Project"), "fileclose",0, this, TQT_SLOT(closeProject()), ac, "project_close"); m_closeProjectAction->setEnabled(false); m_closeProjectAction->setToolTip(i18n("Close project")); m_closeProjectAction->setWhatsThis(i18n("<b>Close project</b><p>Closes the current project.")); - m_projectOptionsAction = new KAction(i18n("Project &Options"), "configure", 0, + m_projectOptionsAction = new TDEAction(i18n("Project &Options"), "configure", 0, this, TQT_SLOT(slotProjectOptions()), ac, "project_options" ); m_projectOptionsAction->setToolTip(i18n("Project options")); diff --git a/src/projectmanager.h b/src/projectmanager.h index 5d932d99..3a92409e 100644 --- a/src/projectmanager.h +++ b/src/projectmanager.h @@ -11,12 +11,12 @@ #include <kservice.h> #include <kurl.h> -class KAction; -class KSelectAction; +class TDEAction; +class TDESelectAction; class KService; class ProjectInfo; class ProjectSession; -class KRecentFilesAction; +class TDERecentFilesAction; class KDevPlugin; @@ -59,7 +59,7 @@ public: KURL projectFile() const; TQString projectName() const; - void createActions( KActionCollection* ac ); + void createActions( TDEActionCollection* ac ); ProjectSession* projectSession() const; @@ -95,8 +95,8 @@ private: ProjectInfo *m_info; - KAction *m_closeProjectAction, *m_projectOptionsAction; - KRecentFilesAction *m_openRecentProjectAction; + TDEAction *m_closeProjectAction, *m_projectOptionsAction; + TDERecentFilesAction *m_openRecentProjectAction; static ProjectManager *s_instance; diff --git a/src/settingswidget.ui b/src/settingswidget.ui index 0fe85778..5d139860 100644 --- a/src/settingswidget.ui +++ b/src/settingswidget.ui @@ -215,7 +215,7 @@ <string></string> </property> </widget> - <widget class="KFontRequester"> + <widget class="TDEFontRequester"> <property name="name"> <cstring>outputFont</cstring> </property> diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index d51bc31e..edb61145 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -393,7 +393,7 @@ void SimpleMainWindow::setCurrentDocumentCaption( const TQString &caption ) } } -KMainWindow *SimpleMainWindow::main() +TDEMainWindow *SimpleMainWindow::main() { return this; } @@ -408,48 +408,48 @@ void SimpleMainWindow::createFramework() void SimpleMainWindow::createActions() { - m_raiseEditor = new KAction(i18n("Raise &Editor"), ALT+Key_C, + m_raiseEditor = new TDEAction(i18n("Raise &Editor"), ALT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(raiseEditor()), actionCollection(), "raise_editor"); m_raiseEditor->setToolTip(i18n("Raise editor")); m_raiseEditor->setWhatsThis(i18n("<b>Raise editor</b><p>Focuses the editor.")); - m_lowerAllDocks = new KAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C, + m_lowerAllDocks = new TDEAction(i18n("Lower All Docks"), CTRL+SHIFT+Key_C, TQT_TQOBJECT(this), TQT_SLOT(lowerAllDocks()), actionCollection(), "lower_all_docks"); - new KAction(i18n("Switch to next TabWidget"), 0, TQT_TQOBJECT(this), + new TDEAction(i18n("Switch to next TabWidget"), 0, TQT_TQOBJECT(this), TQT_SLOT(switchToNextTabWidget()), actionCollection(), "switch_to_next_tabwidget" ); - m_splitHor = new KAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T, + m_splitHor = new TDEAction(i18n("Split &Horizontal"), CTRL+SHIFT+Key_T, TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontalBase()), actionCollection(), "split_h"); m_splitHor->setIcon("view_top_bottom"); - m_splitVer = new KAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L, + m_splitVer = new TDEAction(i18n("Split &Vertical"), CTRL+SHIFT+Key_L, TQT_TQOBJECT(this), TQT_SLOT(slotSplitVerticalBase()), actionCollection(), "split_v"); m_splitVer->setIcon("view_left_right"); - m_splitHor1 = new KAction(i18n("Split &Horizontal"), 0, + m_splitHor1 = new TDEAction(i18n("Split &Horizontal"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h1"); m_splitHor1->setIcon("view_top_bottom"); - m_splitVer1 = new KAction(i18n("Split &Vertical"), 0, + m_splitVer1 = new TDEAction(i18n("Split &Vertical"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v1"); m_splitVer1->setIcon("view_left_right"); - m_splitHor2 = new KAction(i18n("Split &Horizontal and Open"), 0, + m_splitHor2 = new TDEAction(i18n("Split &Horizontal and Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitHorizontal()), actionCollection(), "split_h2"); m_splitHor2->setIcon("view_top_bottom"); - m_splitVer2 = new KAction(i18n("Split &Vertical and Open"), 0, + m_splitVer2 = new TDEAction(i18n("Split &Vertical and Open"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSplitVertical()), actionCollection(), "split_v2"); m_splitVer2->setIcon("view_left_right"); - m_raiseLeftDock = new KAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L, + m_raiseLeftDock = new TDEAction(i18n("Switch Left Dock"), CTRL+SHIFT+ALT+Key_L, TQT_TQOBJECT(this), TQT_SLOT(raiseLeftDock()), actionCollection(), "switch_left_dock"); - m_raiseRightDock = new KAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R, + m_raiseRightDock = new TDEAction(i18n("Switch Right Dock"), CTRL+SHIFT+ALT+Key_R, TQT_TQOBJECT(this), TQT_SLOT(raiseRightDock()), actionCollection(), "switch_right_dock"); - m_raiseBottomDock = new KAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B, + m_raiseBottomDock = new TDEAction(i18n("Switch Bottom Dock"), CTRL+SHIFT+ALT+Key_B, TQT_TQOBJECT(this), TQT_SLOT(raiseBottomDock()), actionCollection(), "switch_bottom_dock"); KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configureToolbars()), @@ -591,7 +591,7 @@ void SimpleMainWindow::tabContext(TQWidget *w, const TQPoint &p) if (!tabWidget) return; - KPopupMenu tabMenu; + TDEPopupMenu tabMenu; tabMenu.insertTitle(tabWidget->tabLabel(w)); //Find the document on whose tab the user clicked @@ -693,7 +693,7 @@ bool SimpleMainWindow::queryExit() void SimpleMainWindow::setupWindowMenu() { // get the xmlgui created one instead - m_windowMenu = static_cast<TQPopupMenu*>(TQT_TQWIDGET(main()->child("window", "KPopupMenu"))); + m_windowMenu = static_cast<TQPopupMenu*>(TQT_TQWIDGET(main()->child("window", "TDEPopupMenu"))); if (!m_windowMenu) { diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h index b72cb9e1..a060a0af 100644 --- a/src/simplemainwindow.h +++ b/src/simplemainwindow.h @@ -25,7 +25,7 @@ #include <kdevmainwindow.h> #include <kdevpartcontroller.h> -class KAction; +class TDEAction; class TQPopupMenu; class MainWindowShare; class Context; @@ -55,7 +55,7 @@ public: virtual void saveSettings(); virtual void setCurrentDocumentCaption( const TQString &caption ); - virtual KMainWindow *main(); + virtual TDEMainWindow *main(); void init(); @@ -119,17 +119,17 @@ private: MainWindowShare *m_mainWindowShare; KURL m_currentTabURL; - KAction *m_raiseEditor; - KAction *m_lowerAllDocks; - KAction *m_splitHor; - KAction *m_splitVer; - KAction *m_splitHor1; - KAction *m_splitVer1; - KAction *m_splitHor2; - KAction *m_splitVer2; - KAction *m_raiseBottomDock; - KAction *m_raiseLeftDock; - KAction *m_raiseRightDock; + TDEAction *m_raiseEditor; + TDEAction *m_lowerAllDocks; + TDEAction *m_splitHor; + TDEAction *m_splitVer; + TDEAction *m_splitHor1; + TDEAction *m_splitVer1; + TDEAction *m_splitHor2; + TDEAction *m_splitVer2; + TDEAction *m_raiseBottomDock; + TDEAction *m_raiseLeftDock; + TDEAction *m_raiseRightDock; TQPopupMenu *m_windowMenu; TQValueList<TQPair<int, KURL> > m_windowList; diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index d8bb26af..b404a159 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -84,7 +84,7 @@ void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context) TQFileInfo fi(popupfile_); popup->insertSeparator(); - KPopupMenu *sub = new KPopupMenu(popup); + TDEPopupMenu *sub = new TDEPopupMenu(popup); TQString name = fi.fileName(); sub->insertTitle( i18n("Actions for %1").arg(name) ); sub->insertItem( i18n("Checkin"), diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp index 98d4894e..11c9c835 100644 --- a/vcs/cvsservice/annotatepage.cpp +++ b/vcs/cvsservice/annotatepage.cpp @@ -94,7 +94,7 @@ void AnnotatePage::startAnnotate( const TQString pathName, const TQString revisi //clear both the outputbuffer and the AnnotateView m_output = ""; - ((KListView*)m_annotateView)->clear(); + ((TDEListView*)m_annotateView)->clear(); kdDebug(9006) << "Running: " << m_cvsAnnotateJob->cvsCommand() << endl; m_cvsAnnotateJob->execute(); @@ -209,7 +209,7 @@ void AnnotatePage::parseAnnotateOutput(TQStringList& lines) //the selected revision is unknown to CVS if (!notEof) { KMessageBox::error(this, i18n("The selected revision does not exist.")); - ((KListView*)m_annotateView)->clear(); + ((TDEListView*)m_annotateView)->clear(); return; } ++it; diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index cd878508..32a1ef40 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -141,7 +141,7 @@ int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col /******************************************************************************/ AnnotateView::AnnotateView(AnnotatePage *parent, const char *name) - : KListView(parent, name), TQToolTip( viewport() ), + : TDEListView(parent, name), TQToolTip( viewport() ), m_page(parent) { setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h index 868cf47f..db49d8f9 100644 --- a/vcs/cvsservice/annotateview.h +++ b/vcs/cvsservice/annotateview.h @@ -30,7 +30,7 @@ class AnnotatePage; * to get a new page which shows the annotate output * of the clicked revision. */ -class AnnotateView : public KListView, public TQToolTip +class AnnotateView : public TDEListView, public TQToolTip { Q_OBJECT diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index 17260ab4..02e03ca5 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -44,12 +44,12 @@ const TQString SSS( ":" ); // Server String Separator :) // class ModuleListViewItem /////////////////////////////////////////////////////////////////////////////// -class ModuleListViewItem : public KListViewItem +class ModuleListViewItem : public TDEListViewItem { public: - ModuleListViewItem( KListView *listview, + ModuleListViewItem( TDEListView *listview, const TQString &moduleAlias, const TQString &moduleRealPath ) - : KListViewItem( listview ) + : TDEListViewItem( listview ) { setAlias( moduleAlias ); setRealPath( moduleRealPath ); @@ -193,7 +193,7 @@ void CheckoutDialog::slotReceivedOutput( TQString someOutput ) setCursor( KCursor::arrowCursor() ); - // Fill the modules KListView if the list obtained is not empty + // Fill the modules TDEListView if the list obtained is not empty // TQStringList modules = m_job->output(); TQStringList modules = TQStringList::split( "\n", someOutput ); if (modules.count() <= 0) diff --git a/vcs/cvsservice/checkoutdialogbase.ui b/vcs/cvsservice/checkoutdialogbase.ui index 38f1e7f0..a9782494 100644 --- a/vcs/cvsservice/checkoutdialogbase.ui +++ b/vcs/cvsservice/checkoutdialogbase.ui @@ -201,7 +201,7 @@ <string>Creates subdirs if needed</string> </property> </widget> - <widget class="KListView"> + <widget class="TDEListView"> <column> <property name="text"> <string>Module</string> diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 89854b1b..173eb07f 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -143,92 +143,92 @@ void CvsServicePart::setupActions() // This actions are used in the menubar: for context menu we build the // context at runtime. See CvsServicePart::contextMenu(). - actionCommit = new KAction( i18n("&Commit to Repository"), 0, this, + actionCommit = new TDEAction( i18n("&Commit to Repository"), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - actionDiff = new KAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), + actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), actionCollection(), "cvsservice_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); - actionLog = new KAction( i18n("Generate &Log"), 0, this, TQT_SLOT(slotActionLog()), + actionLog = new TDEAction( i18n("Generate &Log"), 0, this, TQT_SLOT(slotActionLog()), actionCollection(), "cvsservice_log" ); actionLog->setToolTip( i18n("Generate log") ); actionLog->setWhatsThis( i18n("<b>Generate log</b><p>Produces log for this file.") ); - actionAnnotate = new KAction( i18n("&Annotate"), 0, this, TQT_SLOT(slotActionAnnotate()), + actionAnnotate = new TDEAction( i18n("&Annotate"), 0, this, TQT_SLOT(slotActionAnnotate()), actionCollection(), "cvsservice_annotate" ); actionAnnotate->setToolTip( i18n("Generate annotations") ); actionAnnotate->setWhatsThis( i18n("<b>Annotate</b><p>Produces annotations for this file.") ); - actionAdd = new KAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), + actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "cvsservice_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add to repository</b><p>Adds file to repository.") ); - actionEdit = new KAction( i18n("&Edit Files"), 0, this, TQT_SLOT(slotActionEdit()), + actionEdit = new TDEAction( i18n("&Edit Files"), 0, this, TQT_SLOT(slotActionEdit()), actionCollection(), "cvsservice_edit" ); actionEdit->setToolTip( i18n("Mark as being edited") ); actionEdit->setWhatsThis( i18n("<b>Mark as being edited</b><p>Mark the files as being edited.") ); - actionUnEdit = new KAction( i18n("&Unedit Files"), 0, this, TQT_SLOT(slotActionUnEdit()), + actionUnEdit = new TDEAction( i18n("&Unedit Files"), 0, this, TQT_SLOT(slotActionUnEdit()), actionCollection(), "cvsservice_unedit" ); actionUnEdit->setToolTip( i18n("Remove editing mark from files") ); actionUnEdit->setWhatsThis( i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.") ); - actionEditors = new KAction( i18n("&Show Editors"), 0, this, TQT_SLOT(slotActionEditors()), + actionEditors = new TDEAction( i18n("&Show Editors"), 0, this, TQT_SLOT(slotActionEditors()), actionCollection(), "cvsservice_editors" ); actionEditors->setToolTip( i18n("Show editors") ); actionEditors->setWhatsThis( i18n("<b>Show editors</b><p>Shows the list of users who are editing files.") ); - actionAddBinary = new KAction( i18n("Add to Repository as &Binary"), 0, this, + actionAddBinary = new TDEAction( i18n("Add to Repository as &Binary"), 0, this, TQT_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); actionAddBinary->setToolTip( i18n("Add file to repository as binary") ); actionAddBinary->setWhatsThis( i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).") ); - actionRemove = new KAction( i18n("&Remove From Repository"), 0, this, + actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQT_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); - actionUpdate = new KAction( i18n("&Update/Revert to Another Release"), 0, this, + actionUpdate = new TDEAction( i18n("&Update/Revert to Another Release"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); actionUpdate->setToolTip( i18n("Update/revert") ); actionUpdate->setWhatsThis( i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.") ); - actionRemoveSticky = new KAction( i18n("R&emove Sticky Flag"), 0, + actionRemoveSticky = new TDEAction( i18n("R&emove Sticky Flag"), 0, this, TQT_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); actionRemoveSticky->setToolTip( i18n("Remove sticky flag") ); actionRemoveSticky->setWhatsThis( i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).") ); - actionTag = new KAction( i18n("Make &Tag/Branch"), 0, + actionTag = new TDEAction( i18n("Make &Tag/Branch"), 0, this, TQT_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); actionTag->setToolTip( i18n("Make tag/branch") ); actionTag->setWhatsThis( i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).") ); - actionUnTag = new KAction( i18n("&Delete Tag"), 0, + actionUnTag = new TDEAction( i18n("&Delete Tag"), 0, this, TQT_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); actionUnTag->setToolTip( i18n("Delete tag") ); actionUnTag->setWhatsThis( i18n("<b>Delete tag</b><p>Delete tag from selected file(s).") ); - actionAddToIgnoreList = new KAction( i18n("&Ignore in CVS Operations"), 0, + actionAddToIgnoreList = new TDEAction( i18n("&Ignore in CVS Operations"), 0, this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in CVS operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.") ); - actionRemoveFromIgnoreList = new KAction( i18n("Do &Not Ignore in CVS Operations"), 0, + actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in CVS Operations"), 0, this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in CVS operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.") ); - actionLogin = new KAction( i18n("&Log to Server"), 0, this, + actionLogin = new TDEAction( i18n("&Log to Server"), 0, this, TQT_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); actionLogin->setToolTip( i18n("Login to server") ); actionLogin->setWhatsThis( i18n("<b>Login to server</b><p>Logs in to the CVS server.") ); - actionLogout = new KAction( i18n("L&ogout From Server"), 0, this, + actionLogout = new TDEAction( i18n("L&ogout From Server"), 0, this, TQT_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); actionLogout->setToolTip( i18n("Logout from server") ); actionLogout->setWhatsThis( i18n("<b>Logout from server</b><p>Logs out from the CVS server.") ); @@ -316,7 +316,7 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context ) if (m_urls.count() <= 0) return; - KPopupMenu *subMenu = new KPopupMenu( popup ); + TDEPopupMenu *subMenu = new TDEPopupMenu( popup ); if (context->hasType( Context::FileContext )) popup->insertSeparator(); diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h index 5782dd1d..0b988fba 100644 --- a/vcs/cvsservice/cvspart.h +++ b/vcs/cvsservice/cvspart.h @@ -24,7 +24,7 @@ class TQPopupMenu; class TQDir; class KDialogBase; class KURL; -class KAction; +class TDEAction; class CvsProcessWidget; class CvsForm; @@ -148,7 +148,7 @@ private: TQGuardedPtr<CvsForm> m_cvsConfigurationForm; // Actions - KAction *actionCommit, + TDEAction *actionCommit, *actionDiff, *actionLog, *actionAnnotate, diff --git a/vcs/perforce/README.dox b/vcs/perforce/README.dox index 2c3fc3d8..fe9caa26 100644 --- a/vcs/perforce/README.dox +++ b/vcs/perforce/README.dox @@ -8,7 +8,7 @@ Integrates the perforce version managment system into KDevelop. \feature edit, revert and submit \feature use the diff frontend (also removes the crappy perforce diff headers) -\feature Uses KAction, so you can assign your favourite shortcuts to the commands. +\feature Uses TDEAction, so you can assign your favourite shortcuts to the commands. \requirement Perforce 2003.1 http://www.perforce.com/perforce/products.html diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index e3b64da7..abfa1683 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -48,7 +48,7 @@ CommitDialog::CommitDialog( TQWidget *parent, const char *name ) clientEdit = new KLineEdit( w ); userEdit = new KLineEdit( w ); - filesBox = new KListBox( w ); + filesBox = new TDEListBox( w ); layout = new TQVBoxLayout( w, 0, spacingHint() ); TQLabel *clientLabel = new TQLabel(i18n("C&lient:"), w); diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h index e9cdb1e1..ce870185 100644 --- a/vcs/perforce/commitdlg.h +++ b/vcs/perforce/commitdlg.h @@ -51,7 +51,7 @@ private: void setDepotFiles( const TQStringList& lst ); TQTextEdit *edit; KLineEdit *clientEdit, *userEdit; - KListBox *filesBox; + TDEListBox *filesBox; }; #endif diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index 45ea039b..19df30a7 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -54,31 +54,31 @@ PerforcePart::~PerforcePart() void PerforcePart::setupActions() { - actionEdit = new KAction( i18n("Edit"), 0, this, TQT_SLOT(slotActionEdit()), + actionEdit = new TDEAction( i18n("Edit"), 0, this, TQT_SLOT(slotActionEdit()), actionCollection(), "perforce_edit" ); actionEdit->setToolTip(i18n("Edit")); actionEdit->setWhatsThis(i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit.")); - actionRevert = new KAction( i18n("Revert"), 0, this, TQT_SLOT(slotActionRevert()), + actionRevert = new TDEAction( i18n("Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "perforce_revert" ); actionRevert->setToolTip(i18n("Revert")); actionRevert->setWhatsThis(i18n("<b>Revert</b><p>Discards changes made to open files.")); - actionSubmit = new KAction( i18n("Submit"), 0, this, TQT_SLOT(slotActionCommit()), + actionSubmit = new TDEAction( i18n("Submit"), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "perforce_submit" ); actionSubmit->setToolTip(i18n("Submit")); actionSubmit->setWhatsThis(i18n("<b>Submit</b><p>Sends changes made to open files to the depot.")); - actionSync = new KAction( i18n("Sync"), 0, this, TQT_SLOT(slotActionUpdate()), + actionSync = new TDEAction( i18n("Sync"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "perforce_sync" ); actionSync->setToolTip(i18n("Sync")); actionSync->setWhatsThis(i18n("<b>Sync</b><p>Copies files from the depot into the workspace.")); - actionDiff = new KAction( i18n("Diff Against Repository"), 0, this, TQT_SLOT(slotActionDiff()), + actionDiff = new TDEAction( i18n("Diff Against Repository"), 0, this, TQT_SLOT(slotActionDiff()), actionCollection(), "perforce_diff" ); actionDiff->setToolTip(i18n("Diff against repository")); actionDiff->setWhatsThis(i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot.")); - actionAdd = new KAction( i18n("Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), + actionAdd = new TDEAction( i18n("Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "perforce_add" ); actionAdd->setToolTip(i18n("Add to repository")); actionAdd->setWhatsThis(i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot.")); - actionRemove = new KAction( i18n("Remove From Repository"), 0, this, TQT_SLOT(slotActionRemove()), + actionRemove = new TDEAction( i18n("Remove From Repository"), 0, this, TQT_SLOT(slotActionRemove()), actionCollection(), "perforce_remove" ); actionRemove->setToolTip(i18n("Remove from repository")); actionRemove->setWhatsThis(i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot.")); @@ -92,7 +92,7 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context) TQFileInfo fi( popupfile ); popup->insertSeparator(); - KPopupMenu *sub = new KPopupMenu(popup); + TDEPopupMenu *sub = new TDEPopupMenu(popup); TQString name = fi.fileName(); sub->insertTitle( i18n("Actions for %1").arg(name) ); diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h index 462f53f6..81a94e1c 100644 --- a/vcs/perforce/perforcepart.h +++ b/vcs/perforce/perforcepart.h @@ -18,7 +18,7 @@ class Context; class TQPopupMenu; -class KAction; +class TDEAction; class PerforcePart : public KDevVersionControl { @@ -72,7 +72,7 @@ private: void execCommand( const TQString& cmd, const TQString& filename ); void setupActions(); TQString popupfile; - KAction *actionEdit, *actionRevert, + TDEAction *actionEdit, *actionRevert, *actionSubmit, *actionSync, *actionDiff, *actionAdd, *actionRemove; }; diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index 7c41c29b..2af899a1 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -98,64 +98,64 @@ subversionPart::~subversionPart() { } void subversionPart::setupActions() { - actionCommit = new KAction( i18n("&Commit to Repository..."), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); + actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - /* actionDiff = new KAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), + /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), actionCollection(), "subversion_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); */ - actionAdd = new KAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); + actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add file to repository</b><p>Adds file to repository.") ); - actionLog = new KAction( i18n("Show logs..."), 0, this, TQT_SLOT(slotLog()), actionCollection(), "subversion_log" ); - actionBlame = new KAction( i18n("Blame..."), 0, this, TQT_SLOT(slotBlame()), actionCollection(), "subversion_blame"); + actionLog = new TDEAction( i18n("Show logs..."), 0, this, TQT_SLOT(slotLog()), actionCollection(), "subversion_log" ); + actionBlame = new TDEAction( i18n("Blame..."), 0, this, TQT_SLOT(slotBlame()), actionCollection(), "subversion_blame"); - actionRemove = new KAction( i18n("&Remove From Repository"), 0, this, TQT_SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); + actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQT_SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); - actionUpdate = new KAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); + actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); actionUpdate->setToolTip( i18n("Update") ); actionUpdate->setWhatsThis( i18n("<b>Update</b><p>Updates file(s) from repository.") ); - actionDiffLocal = new KAction( i18n("&Diff to BASE"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); + actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); actionDiffLocal->setToolTip( i18n("Diff to BASE") ); actionDiffLocal->setWhatsThis( i18n("<b>Diff to disk</b><p>Diff current file to the BASE checked out copy.") ); - actionDiffHead = new KAction( i18n("&Diff to HEAD"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); + actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); actionDiffHead->setToolTip( i18n("Diff to HEAD") ); actionDiffHead->setWhatsThis( i18n("<b>Diff HEAD</b><p>Diff the current file to HEAD in svn.") ); - actionRevert = new KAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); + actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); actionRevert->setToolTip( i18n("Revert") ); actionRevert->setWhatsThis( i18n("<b>Revert</b><p>Undo local changes.") ); /* - actionAddToIgnoreList = new KAction( i18n("&Ignore in Subversion Operations"), 0, + actionAddToIgnoreList = new TDEAction( i18n("&Ignore in Subversion Operations"), 0, this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in Subversion operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).") ); - actionRemoveFromIgnoreList = new KAction( i18n("Do &Not Ignore in Subversion Operations"), 0, + actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in Subversion Operations"), 0, this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in Subversion operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).") ); */ - actionResolve = new KAction( i18n("Re&solve Conflicting State"), 0, + actionResolve = new TDEAction( i18n("Re&solve Conflicting State"), 0, this, TQT_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); actionResolve->setToolTip( i18n("Resolve the conflicting state of a file after a merge") ); actionResolve->setWhatsThis( i18n("<b>Resolve the conflicting state</b><p>Remove the conflict state that can be set on a file after a merge failed.") ); - actionSwitch = new KAction( i18n("Switch this working copy to URL.."), 0, + actionSwitch = new TDEAction( i18n("Switch this working copy to URL.."), 0, this, TQT_SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); // warn slogCopy(), slotMerge only works on context menu. There is no main-menu action - actionCopy = new KAction( i18n("Copy this working copy to URL.."), 0, + actionCopy = new TDEAction( i18n("Copy this working copy to URL.."), 0, this, TQT_SLOT(slotCopy()), actionCollection(), "subversion_copy" ); - actionMerge = new KAction( i18n("Merge difference to working copy"), 0, + actionMerge = new TDEAction( i18n("Merge difference to working copy"), 0, this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); } @@ -209,7 +209,7 @@ if(!project()) if (m_urls.count() <= 0) return; - KPopupMenu *subMenu = new KPopupMenu( popup ); + TDEPopupMenu *subMenu = new TDEPopupMenu( popup ); if (context->hasType( Context::FileContext )) popup->insertSeparator(); diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h index a5490251..1847567d 100644 --- a/vcs/subversion/subversion_part.h +++ b/vcs/subversion/subversion_part.h @@ -92,7 +92,7 @@ private: TQGuardedPtr<subversionCore> m_impl; KURL::List m_urls; - KAction *actionCommit, + TDEAction *actionCommit, *actionDiffHead, *actionDiffLocal, *actionAdd, |