From f78eb03afb8c9a380985d26286afc40b4c89b292 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:15:35 -0600 Subject: Rename a number of classes to enhance compatibility with KDE4 --- vcs/cvsservice/annotatepage.cpp | 4 ++-- vcs/cvsservice/annotateview.cpp | 2 +- vcs/cvsservice/annotateview.h | 2 +- vcs/cvsservice/checkoutdialog.cpp | 8 ++++---- vcs/cvsservice/checkoutdialogbase.ui | 2 +- vcs/cvsservice/cvspart.cpp | 38 ++++++++++++++++++------------------ vcs/cvsservice/cvspart.h | 4 ++-- 7 files changed, 30 insertions(+), 30 deletions(-) (limited to 'vcs/cvsservice') 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 @@ Creates subdirs if needed - + Module 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("Commit file(s)

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("Build difference

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("Generate log

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("Annotate

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("Add to repository

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("Mark as being edited

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("Remove editing mark

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("Show editors

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("Add to repository as binary

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("Remove from repository

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("Update/revert to another release

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("Remove sticky flag

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("Make tag/branch

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("Delete tag

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("Ignore in CVS operations

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("Do not ignore in CVS operations

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("Login to server

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("Logout from server

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 m_cvsConfigurationForm; // Actions - KAction *actionCommit, + TDEAction *actionCommit, *actionDiff, *actionLog, *actionAnnotate, -- cgit v1.2.1