diff options
Diffstat (limited to 'vcs')
| -rw-r--r-- | vcs/clearcase/clearcasepart.cpp | 2 | ||||
| -rw-r--r-- | vcs/cvsservice/annotatepage.cpp | 4 | ||||
| -rw-r--r-- | vcs/cvsservice/annotateview.cpp | 2 | ||||
| -rw-r--r-- | vcs/cvsservice/annotateview.h | 2 | ||||
| -rw-r--r-- | vcs/cvsservice/checkoutdialog.cpp | 8 | ||||
| -rw-r--r-- | vcs/cvsservice/checkoutdialogbase.ui | 2 | ||||
| -rw-r--r-- | vcs/cvsservice/cvspart.cpp | 38 | ||||
| -rw-r--r-- | vcs/cvsservice/cvspart.h | 4 | ||||
| -rw-r--r-- | vcs/perforce/README.dox | 2 | ||||
| -rw-r--r-- | vcs/perforce/commitdlg.cpp | 2 | ||||
| -rw-r--r-- | vcs/perforce/commitdlg.h | 2 | ||||
| -rw-r--r-- | vcs/perforce/perforcepart.cpp | 16 | ||||
| -rw-r--r-- | vcs/perforce/perforcepart.h | 4 | ||||
| -rw-r--r-- | vcs/subversion/subversion_part.cpp | 34 | ||||
| -rw-r--r-- | vcs/subversion/subversion_part.h | 2 | 
15 files changed, 62 insertions, 62 deletions
| 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, | 
