From 47bca8a908a56349637c0b91f4fc4f49f85f820f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 15:06:09 -0600 Subject: [PATCH] Rename a number of classes to enhance compatibility with KDE4 --- src/svnfrontend/blamedisplay.ui | 8 +- src/svnfrontend/blamedisplay_impl.cpp | 22 +- src/svnfrontend/blamedisplay_impl.h | 6 +- src/svnfrontend/filelistviewitem.cpp | 12 +- src/svnfrontend/filelistviewitem.h | 2 +- src/svnfrontend/fronthelpers/propertyitem.cpp | 8 +- src/svnfrontend/fronthelpers/propertyitem.h | 6 +- src/svnfrontend/fronthelpers/propertylist.cpp | 4 +- src/svnfrontend/fronthelpers/propertylist.h | 2 +- src/svnfrontend/graphtree/revisiontree.h | 4 +- src/svnfrontend/opencontextmenu.cpp | 6 +- src/svnfrontend/svnactions.cpp | 2 +- src/svnfrontend/svnlogdlg.ui | 4 +- src/svnfrontend/svnlogdlgimp.cpp | 20 +- src/svnfrontend/tdesvnfilelist.cpp | 188 +++++++++--------- src/svnfrontend/tdesvnfilelist.h | 28 +-- src/tdesvn.cpp | 50 ++--- src/tdesvn.h | 18 +- src/tdesvn_part.cpp | 28 +-- src/tdesvnview.cpp | 2 +- src/tdesvnview.h | 6 +- 21 files changed, 213 insertions(+), 213 deletions(-) diff --git a/src/svnfrontend/blamedisplay.ui b/src/svnfrontend/blamedisplay.ui index dd33704..344d081 100644 --- a/src/svnfrontend/blamedisplay.ui +++ b/src/svnfrontend/blamedisplay.ui @@ -16,7 +16,7 @@ unnamed - + Line @@ -86,9 +86,9 @@ m_BlameList - contextMenu(KListView*,TQListViewItem*,const TQPoint&) + contextMenu(TDEListView*,TQListViewItem*,const TQPoint&) BlameDisplay - slotContextMenuRequested(KListView*,TQListViewItem*,const TQPoint&) + slotContextMenuRequested(TDEListView*,TQListViewItem*,const TQPoint&) m_BlameList @@ -101,7 +101,7 @@ class TQListViewItem; - slotContextMenuRequested(KListView*,TQListViewItem*, const TQPoint&) + slotContextMenuRequested(TDEListView*,TQListViewItem*, const TQPoint&) slotItemDoubleClicked(TQListViewItem*) diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index 6eccfa0..e542b9d 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -93,11 +93,11 @@ protected: TQTextCodec* LocalizedAnnotatedLine::cc = 0; bool LocalizedAnnotatedLine::codec_searched = false; -class BlameDisplayItem:public KListViewItem +class BlameDisplayItem:public TDEListViewItem { public: - BlameDisplayItem(KListView*,const svn::AnnotateLine&,bool,BlameDisplay_impl*); - BlameDisplayItem(KListView*,BlameDisplayItem*,const svn::AnnotateLine&,bool,BlameDisplay_impl*); + BlameDisplayItem(TDEListView*,const svn::AnnotateLine&,bool,BlameDisplay_impl*); + BlameDisplayItem(TDEListView*,BlameDisplayItem*,const svn::AnnotateLine&,bool,BlameDisplay_impl*); virtual ~BlameDisplayItem(){} virtual int compare(TQListViewItem *i, int col, bool ascending)const; virtual void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment); @@ -128,14 +128,14 @@ protected: BlameDisplay_impl*cb; }; -BlameDisplayItem::BlameDisplayItem(KListView*lv,const svn::AnnotateLine&al,bool disp,BlameDisplay_impl*_c) - : KListViewItem(lv),m_Content(al),m_disp(disp),cb(_c) +BlameDisplayItem::BlameDisplayItem(TDEListView*lv,const svn::AnnotateLine&al,bool disp,BlameDisplay_impl*_c) + : TDEListViewItem(lv),m_Content(al),m_disp(disp),cb(_c) { display(); } -BlameDisplayItem::BlameDisplayItem(KListView*lv,BlameDisplayItem*it,const svn::AnnotateLine&al,bool disp,BlameDisplay_impl*_c) - : KListViewItem(lv,it),m_Content(al),m_disp(disp),cb(_c) +BlameDisplayItem::BlameDisplayItem(TDEListView*lv,BlameDisplayItem*it,const svn::AnnotateLine&al,bool disp,BlameDisplay_impl*_c) + : TDEListViewItem(lv,it),m_Content(al),m_disp(disp),cb(_c) { display(); } @@ -145,9 +145,9 @@ BlameDisplayItem::BlameDisplayItem(KListView*lv,BlameDisplayItem*it,const svn::A int BlameDisplayItem::width (const TQFontMetrics & fm, const TQListView * lv, int c ) const { if (c == COL_LINE) { - return KListViewItem::width(TQFontMetrics(TDEGlobalSettings::fixedFont()),lv,c)+2*BORDER; + return TDEListViewItem::width(TQFontMetrics(TDEGlobalSettings::fixedFont()),lv,c)+2*BORDER; } - return KListViewItem::width(fm,lv,c)+2*BORDER; + return TDEListViewItem::width(fm,lv,c)+2*BORDER; } void BlameDisplayItem::display() @@ -266,7 +266,7 @@ void BlameDisplay_impl::setCb(SimpleLogCb*_cb) void BlameDisplay_impl::setContent(const TQString&what,const svn::AnnotatedFile&blame) { m_Data->m_File = what; - m_SearchWidget = new KListViewSearchLineWidget(m_BlameList,this); + m_SearchWidget = new TDEListViewSearchLineWidget(m_BlameList,this); EncodingSelector_impl*m_Ls = new EncodingSelector_impl(Kdesvnsettings::locale_for_blame(),this); connect(m_Ls,TQT_SIGNAL(TextCodecChanged(const TQString&)), this,TQT_SLOT(slotTextCodecChanged(const TQString&))); @@ -376,7 +376,7 @@ void BlameDisplay_impl::slotGoLine() } } -void BlameDisplay_impl::slotContextMenuRequested(KListView*,TQListViewItem*item, const TQPoint&pos) +void BlameDisplay_impl::slotContextMenuRequested(TDEListView*,TQListViewItem*item, const TQPoint&pos) { if (item==0||item->rtti()!=1000) return; BlameDisplayItem*bit = static_cast(item); diff --git a/src/svnfrontend/blamedisplay_impl.h b/src/svnfrontend/blamedisplay_impl.h index c12744c..e248b35 100644 --- a/src/svnfrontend/blamedisplay_impl.h +++ b/src/svnfrontend/blamedisplay_impl.h @@ -26,7 +26,7 @@ class BlameDisplayData; class SimpleLogCb; class BlameDisplayItem; -class KListViewSearchLineWidget; +class TDEListViewSearchLineWidget; class BlameDisplay_impl:public BlameDisplay { @@ -49,13 +49,13 @@ public slots: virtual void slotShowCurrentCommit(); protected slots: - virtual void slotContextMenuRequested(KListView*,TQListViewItem*, const TQPoint&); + virtual void slotContextMenuRequested(TDEListView*,TQListViewItem*, const TQPoint&); virtual void slotSelectionChanged(); virtual void slotTextCodecChanged(const TQString&); protected: virtual void showCommit(BlameDisplayItem*); - KListViewSearchLineWidget* m_SearchWidget; + TDEListViewSearchLineWidget* m_SearchWidget; private: BlameDisplayData*m_Data; diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp index a7b3cf0..3de0b26 100644 --- a/src/svnfrontend/filelistviewitem.cpp +++ b/src/svnfrontend/filelistviewitem.cpp @@ -47,7 +47,7 @@ const int FileListViewItem::COL_IS_LOCKED = 5; //const int FileListViewItem::COL_CURRENT_REV = 5; FileListViewItem::FileListViewItem(tdesvnfilelist*_parent,const svn::StatusPtr&_stat) - : KListViewItem(_parent),SvnItem(_stat), + : TDEListViewItem(_parent),SvnItem(_stat), sortChar(0), m_Ksvnfilelist(_parent) { @@ -56,7 +56,7 @@ FileListViewItem::FileListViewItem(tdesvnfilelist*_parent,const svn::StatusPtr&_ } FileListViewItem::FileListViewItem(tdesvnfilelist*_parent,FileListViewItem*_parentItem,const svn::StatusPtr&_stat) - : KListViewItem(_parentItem),SvnItem(_stat), + : TDEListViewItem(_parentItem),SvnItem(_stat), sortChar(0), m_Ksvnfilelist(_parent) { @@ -87,7 +87,7 @@ void FileListViewItem::setOpen(bool o) } m_Ksvnfilelist->setFocus(); } - KListViewItem::setOpen(o); + TDEListViewItem::setOpen(o); } void FileListViewItem::setOpenNoBlock(bool o) @@ -97,7 +97,7 @@ void FileListViewItem::setOpenNoBlock(bool o) m_Ksvnfilelist->slotItemRead(this); } } - KListViewItem::setOpen(o); + TDEListViewItem::setOpen(o); } FileListViewItem::~FileListViewItem() @@ -251,7 +251,7 @@ void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum { bool colors = Kdesvnsettings::colored_state(); if (!colors||m_bgColor==NONE) { - KListViewItem::paintCell(p,cg,column,width,alignment); + TDEListViewItem::paintCell(p,cg,column,width,alignment); return; } TQColorGroup _cg = cg; @@ -285,7 +285,7 @@ void FileListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int colum _bgColor = Kdesvnsettings::color_need_lock(); break; default: - KListViewItem::paintCell(p,cg,column,width,alignment); + TDEListViewItem::paintCell(p,cg,column,width,alignment); return; break; } diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h index c1685fa..525fc93 100644 --- a/src/svnfrontend/filelistviewitem.h +++ b/src/svnfrontend/filelistviewitem.h @@ -34,7 +34,7 @@ class SvnActions; /** @author Rajko Albrecht */ -class FileListViewItem : public KListViewItem,public SvnItem +class FileListViewItem : public TDEListViewItem,public SvnItem { friend class tdesvnfilelist; public: diff --git a/src/svnfrontend/fronthelpers/propertyitem.cpp b/src/svnfrontend/fronthelpers/propertyitem.cpp index adf16d0..a78a29e 100644 --- a/src/svnfrontend/fronthelpers/propertyitem.cpp +++ b/src/svnfrontend/fronthelpers/propertyitem.cpp @@ -2,16 +2,16 @@ #include #include -PropertyListViewItem::PropertyListViewItem(KListView *parent,const TQString&aName,const TQString&aValue) - : KListViewItem(parent),m_currentName(aName),m_startName(aName),m_currentValue(aValue),m_startValue(aValue),m_deleted(false) +PropertyListViewItem::PropertyListViewItem(TDEListView *parent,const TQString&aName,const TQString&aValue) + : TDEListViewItem(parent),m_currentName(aName),m_startName(aName),m_currentValue(aValue),m_startValue(aValue),m_deleted(false) { setMultiLinesEnabled(true); setText(0,startName()); setText(1,startValue()); } -PropertyListViewItem::PropertyListViewItem(KListView *parent) - : KListViewItem(parent),m_currentName(""),m_startName(""),m_currentValue(""),m_startValue(""),m_deleted(false) +PropertyListViewItem::PropertyListViewItem(TDEListView *parent) + : TDEListViewItem(parent),m_currentName(""),m_startName(""),m_currentValue(""),m_startValue(""),m_deleted(false) { setMultiLinesEnabled(true); setText(0,startName()); diff --git a/src/svnfrontend/fronthelpers/propertyitem.h b/src/svnfrontend/fronthelpers/propertyitem.h index 4a826b0..8a1d8c2 100644 --- a/src/svnfrontend/fronthelpers/propertyitem.h +++ b/src/svnfrontend/fronthelpers/propertyitem.h @@ -6,15 +6,15 @@ class PropertiesDlg; class Propertylist; -class PropertyListViewItem:public KListViewItem +class PropertyListViewItem:public TDEListViewItem { friend class PropertiesDlg; friend class Propertylist; public: static const int _RTTI_ = 1001; - PropertyListViewItem(KListView *parent,const TQString&,const TQString&); - PropertyListViewItem(KListView *parent); + PropertyListViewItem(TDEListView *parent,const TQString&,const TQString&); + PropertyListViewItem(TDEListView *parent); virtual ~PropertyListViewItem(); const TQString&startName()const{return m_startName;} diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp index 7dd0d9d..49fdb36 100644 --- a/src/svnfrontend/fronthelpers/propertylist.cpp +++ b/src/svnfrontend/fronthelpers/propertylist.cpp @@ -26,7 +26,7 @@ Propertylist::Propertylist(TQWidget *parent, const char *name) - : KListView(parent, name),m_commitit(false) + : TDEListView(parent, name),m_commitit(false) { addColumn(i18n("Property")); addColumn(i18n("Value")); @@ -76,7 +76,7 @@ void Propertylist::displayList(const svn::PathPropertiesMapListPtr&propList,bool void Propertylist::clear() { - KListView::clear(); + TDEListView::clear(); } /*! diff --git a/src/svnfrontend/fronthelpers/propertylist.h b/src/svnfrontend/fronthelpers/propertylist.h index a1916b4..1d39a30 100644 --- a/src/svnfrontend/fronthelpers/propertylist.h +++ b/src/svnfrontend/fronthelpers/propertylist.h @@ -26,7 +26,7 @@ /** @author */ -class Propertylist : public KListView +class Propertylist : public TDEListView { Q_OBJECT diff --git a/src/svnfrontend/graphtree/revisiontree.h b/src/svnfrontend/graphtree/revisiontree.h index e6e5de1..199929d 100644 --- a/src/svnfrontend/graphtree/revisiontree.h +++ b/src/svnfrontend/graphtree/revisiontree.h @@ -30,8 +30,8 @@ class RtreeData; class TQWidget; -class KListViewItem; -class KListView; +class TDEListViewItem; +class TDEListView; class CContextListener; namespace svn diff --git a/src/svnfrontend/opencontextmenu.cpp b/src/svnfrontend/opencontextmenu.cpp index d063e46..68aa496 100644 --- a/src/svnfrontend/opencontextmenu.cpp +++ b/src/svnfrontend/opencontextmenu.cpp @@ -37,7 +37,7 @@ void OpenContextmenu::setup() m_mapPopup.clear(); TDETrader::OfferList::ConstIterator it = m_List.begin(); int id = 1; - KAction*act; + TDEAction*act; for( ; it != m_List.end(); ++it ) { if ((*it)->noDisplay()) continue; @@ -46,7 +46,7 @@ void OpenContextmenu::setup() nam.setNum( id ); TQString actionName( (*it)->name().replace("&", "&&") ); - act = new KAction( actionName, (*it)->pixmap( KIcon::Small ), 0, + act = new TDEAction( actionName, (*it)->pixmap( KIcon::Small ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), TQT_TQOBJECT(this), nam.prepend( "appservice_" ) ); act->plug(this); m_mapPopup[ id++ ] = *it; @@ -54,7 +54,7 @@ void OpenContextmenu::setup() if (m_List.count()>0) { insertSeparator( ); } - act = new KAction(i18n("Other..."),0, 0, + act = new TDEAction(i18n("Other..."),0, 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenWith() ),TQT_TQOBJECT(this),"openwith"); act->plug(this); } diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index a0b883a..ad61ee5 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -2338,7 +2338,7 @@ void SvnActions::checkAddItems(const TQString&path,bool print_error_box) if (rlist.size()==0) { if (print_error_box) KMessageBox::error(m_Data->m_ParentList->realWidget(),i18n("No unversioned items found.")); } else { - KListView*ptr; + TDEListView*ptr; KDialogBase * dlg = createDialog(&ptr,i18n("Add unversioned items"),true,"add_items_dlg"); ptr->addColumn("Item"); for (unsigned j = 0; j Horizontal - + 1 @@ -198,7 +198,7 @@ m_LogDisplay - + Action diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp index 5bbf229..3434e46 100644 --- a/src/svnfrontend/svnlogdlgimp.cpp +++ b/src/svnfrontend/svnlogdlgimp.cpp @@ -46,16 +46,16 @@ const char* SvnLogDlgImp::groupName = "log_dialog_size"; -class LogListViewItem:public KListViewItem +class LogListViewItem:public TDEListViewItem { public: - LogListViewItem (KListView *parent,const svn::LogEntry&); + LogListViewItem (TDEListView *parent,const svn::LogEntry&); virtual int compare( TQListViewItem* i, int col, bool ascending ) const; static const int COL_MARKER,COL_REV,COL_AUTHOR,COL_DATE,COL_MSG; const TQString&message()const; svn_revnum_t rev()const{return _revision;} - void showChangedEntries(KListView*); + void showChangedEntries(TDEListView*); unsigned int numChangedEntries(){return changedPaths.count();} void setChangedEntries(const svn::LogEntry&); void setRealName(const TQString&_n){_realName=_n;} @@ -77,10 +77,10 @@ const int LogListViewItem::COL_AUTHOR = 1; const int LogListViewItem::COL_DATE = 3; const int LogListViewItem::COL_MSG = 4; -class LogChangePathItem:public KListViewItem +class LogChangePathItem:public TDEListViewItem { public: - LogChangePathItem(KListView*parent,const svn::LogChangePathEntry&); + LogChangePathItem(TDEListView*parent,const svn::LogChangePathEntry&); virtual ~LogChangePathItem(){} TQChar action() const{return _action;} @@ -94,8 +94,8 @@ protected: svn_revnum_t _revision; }; -LogListViewItem::LogListViewItem(KListView*_parent,const svn::LogEntry&_entry) - : KListViewItem(_parent),_realName(TQString()) +LogListViewItem::LogListViewItem(TDEListView*_parent,const svn::LogEntry&_entry) + : TDEListViewItem(_parent),_realName(TQString()) { setMultiLinesEnabled(false); _revision=_entry.revision; @@ -131,7 +131,7 @@ int LogListViewItem::compare( TQListViewItem* item, int col, bool ) const return text(col).localeAwareCompare(k->text(col)); } -void LogListViewItem::showChangedEntries(KListView*where) +void LogListViewItem::showChangedEntries(TDEListView*where) { if (!where)return; where->clear(); @@ -143,8 +143,8 @@ void LogListViewItem::showChangedEntries(KListView*where) } } -LogChangePathItem::LogChangePathItem(KListView*parent,const svn::LogChangePathEntry&e) - :KListViewItem(parent) +LogChangePathItem::LogChangePathItem(TDEListView*parent,const svn::LogChangePathEntry&e) + :TDEListViewItem(parent) { _action = TQChar(e.action); setText(0,_action); diff --git a/src/svnfrontend/tdesvnfilelist.cpp b/src/svnfrontend/tdesvnfilelist.cpp index 2e14855..2dd3368 100644 --- a/src/svnfrontend/tdesvnfilelist.cpp +++ b/src/svnfrontend/tdesvnfilelist.cpp @@ -189,8 +189,8 @@ bool KdesvnFileListPrivate::reReadSettings() _unknown != mdisp_unknown_files); } -tdesvnfilelist::tdesvnfilelist(KActionCollection*aCollect,TQWidget *parent, const char *name) - : KListView(parent, name),ItemDisplay(),m_SvnWrapper(new SvnActions(this)) +tdesvnfilelist::tdesvnfilelist(TDEActionCollection*aCollect,TQWidget *parent, const char *name) + : TDEListView(parent, name),ItemDisplay(),m_SvnWrapper(new SvnActions(this)) { m_SelectedItems = 0; m_pList = new KdesvnFileListPrivate; @@ -256,155 +256,155 @@ svn::Client*tdesvnfilelist::svnclient() void tdesvnfilelist::setupActions() { if (!m_filesAction) return; - KAction*tmp_action; + TDEAction*tmp_action; /* local and remote actions */ /* 1. actions on dirs AND files */ - //new KAction(i18n("Log..."),"tdesvnlog",KShortcut(SHIFT+CTRL+Key_L),this,TQT_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log"); - new KAction(i18n("Full Log"),"tdesvnlog",KShortcut(CTRL+Key_L),TQT_TQOBJECT(this),TQT_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full"); - new KAction(i18n("Full revision tree"),"tdesvnlog",KShortcut(CTRL+Key_T),TQT_TQOBJECT(this),TQT_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree"); - new KAction(i18n("Partial revision tree"),"tdesvnlog",KShortcut(SHIFT+CTRL+Key_T), + //new TDEAction(i18n("Log..."),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_L),this,TQT_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log"); + new TDEAction(i18n("Full Log"),"tdesvnlog",TDEShortcut(CTRL+Key_L),TQT_TQOBJECT(this),TQT_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full"); + new TDEAction(i18n("Full revision tree"),"tdesvnlog",TDEShortcut(CTRL+Key_T),TQT_TQOBJECT(this),TQT_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree"); + new TDEAction(i18n("Partial revision tree"),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_T), TQT_TQOBJECT(this),TQT_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree"); - new KAction(i18n("Properties"),"edit", - KShortcut(CTRL+Key_P),m_SvnWrapper,TQT_SLOT(slotProperties()),m_filesAction,"make_svn_property"); - new KAction(i18n("Display Properties"),"edit", - KShortcut(SHIFT+CTRL+Key_P),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property"); + new TDEAction(i18n("Properties"),"edit", + TDEShortcut(CTRL+Key_P),m_SvnWrapper,TQT_SLOT(slotProperties()),m_filesAction,"make_svn_property"); + new TDEAction(i18n("Display Properties"),"edit", + TDEShortcut(SHIFT+CTRL+Key_P),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property"); - tmp_action = new KAction(i18n("Display last changes"),"tdesvndiff", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change"); + tmp_action = new TDEAction(i18n("Display last changes"),"tdesvndiff", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change"); tmp_action->setToolTip(i18n("Display last changes as difference to previous commit.")); - m_InfoAction = new KAction(i18n("Details"),"tdesvninfo", - KShortcut(CTRL+Key_I),TQT_TQOBJECT(this),TQT_SLOT(slotInfo()),m_filesAction,"make_svn_info"); - m_RenameAction = new KAction(i18n("Move"),"move", - KShortcut(Key_F2),TQT_TQOBJECT(this),TQT_SLOT(slotRename()),m_filesAction,"make_svn_rename"); - m_CopyAction = new KAction(i18n("Copy"),"tdesvncopy", - KShortcut(CTRL+Key_C),TQT_TQOBJECT(this),TQT_SLOT(slotCopy()),m_filesAction,"make_svn_copy"); - tmp_action = new KAction(i18n("Check for updates"),"tdesvncheckupdates",KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates"); + m_InfoAction = new TDEAction(i18n("Details"),"tdesvninfo", + TDEShortcut(CTRL+Key_I),TQT_TQOBJECT(this),TQT_SLOT(slotInfo()),m_filesAction,"make_svn_info"); + m_RenameAction = new TDEAction(i18n("Move"),"move", + TDEShortcut(Key_F2),TQT_TQOBJECT(this),TQT_SLOT(slotRename()),m_filesAction,"make_svn_rename"); + m_CopyAction = new TDEAction(i18n("Copy"),"tdesvncopy", + TDEShortcut(CTRL+Key_C),TQT_TQOBJECT(this),TQT_SLOT(slotCopy()),m_filesAction,"make_svn_copy"); + tmp_action = new TDEAction(i18n("Check for updates"),"tdesvncheckupdates",TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates"); tmp_action->setToolTip(i18n("Check if current working copy has items with newer version in repository")); /* 2. actions only on files */ - m_BlameAction = new KAction(i18n("Blame"),"tdesvnblame", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotBlame()),m_filesAction,"make_svn_blame"); + m_BlameAction = new TDEAction(i18n("Blame"),"tdesvnblame", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotBlame()),m_filesAction,"make_svn_blame"); m_BlameAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line.")); - m_BlameRangeAction = new KAction(i18n("Blame range"),"tdesvnblame", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame"); + m_BlameRangeAction = new TDEAction(i18n("Blame range"),"tdesvnblame", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame"); m_BlameRangeAction->setToolTip(i18n("Output the content of specified files or URLs with revision and author information in-line.")); - m_CatAction = new KAction(i18n("Cat head"), "tdesvncat", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCat()),m_filesAction,"make_svn_cat"); + m_CatAction = new TDEAction(i18n("Cat head"), "tdesvncat", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCat()),m_filesAction,"make_svn_cat"); m_CatAction->setToolTip(i18n("Output the content of specified files or URLs.")); - tmp_action = new KAction(i18n("Cat revision..."),"tdesvncat", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat"); + tmp_action = new TDEAction(i18n("Cat revision..."),"tdesvncat", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat"); tmp_action->setToolTip(i18n("Output the content of specified files or URLs at specific revision.")); - m_LockAction = new KAction(i18n("Lock current items"),"tdesvnlock", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotLock()),m_filesAction,"make_svn_lock"); - m_UnlockAction = new KAction(i18n("Unlock current items"),"tdesvnunlock", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock"); + m_LockAction = new TDEAction(i18n("Lock current items"),"tdesvnlock", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotLock()),m_filesAction,"make_svn_lock"); + m_UnlockAction = new TDEAction(i18n("Unlock current items"),"tdesvnunlock", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock"); /* 3. actions only on dirs */ - m_MkdirAction = new KAction(i18n("New folder"),"folder_new", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir"); - m_switchRepository = new KAction(i18n("Switch repository"),"tdesvnswitch", - KShortcut(), m_SvnWrapper,TQT_SLOT(slotSwitch()),m_filesAction,"make_svn_switch"); + m_MkdirAction = new TDEAction(i18n("New folder"),"folder_new", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir"); + m_switchRepository = new TDEAction(i18n("Switch repository"),"tdesvnswitch", + TDEShortcut(), m_SvnWrapper,TQT_SLOT(slotSwitch()),m_filesAction,"make_svn_switch"); m_switchRepository->setToolTip(i18n("Switch repository path of current working copy path (\"svn switch\")")); - tmp_action = new KAction(i18n("Relocate current working copy url"),"tdesvnrelocate",KShortcut(), + tmp_action = new TDEAction(i18n("Relocate current working copy url"),"tdesvnrelocate",TDEShortcut(), TQT_TQOBJECT(this),TQT_SLOT(slotRelocate()),m_filesAction,"make_svn_relocate"); tmp_action->setToolTip(i18n("Relocate url of current working copy path to other url")); - tmp_action = new KAction(i18n("Check for unversioned items"),"tdesvnaddrecursive",KShortcut(), + tmp_action = new TDEAction(i18n("Check for unversioned items"),"tdesvnaddrecursive",TDEShortcut(), TQT_TQOBJECT(this),TQT_SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned"); tmp_action->setToolTip(i18n("Browse folder for unversioned items and add them if wanted.")); - m_changeToRepository = new KAction(i18n("Open repository of working copy"),"gohome",KShortcut(), + m_changeToRepository = new TDEAction(i18n("Open repository of working copy"),"gohome",TDEShortcut(), TQT_TQOBJECT(this),TQT_SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo"); m_changeToRepository->setToolTip(i18n("Opens the repository the current working copy was checked out from")); - m_CleanupAction = new KAction(i18n("Cleanup"),"tdesvncleanup", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCleanupAction()),m_filesAction,"make_cleanup"); + m_CleanupAction = new TDEAction(i18n("Cleanup"),"tdesvncleanup", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCleanupAction()),m_filesAction,"make_cleanup"); m_CleanupAction->setToolTip(i18n("Recursively clean up the working copy, removing locks, resuming unfinished operations, etc.")); - m_ImportDirsIntoCurrent = new KAction(i18n("Import folders into current"),"fileimport",KShortcut(), + m_ImportDirsIntoCurrent = new TDEAction(i18n("Import folders into current"),"fileimport",TDEShortcut(), TQT_TQOBJECT(this),TQT_SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current"); m_ImportDirsIntoCurrent->setToolTip(i18n("Import folder content into current url")); /* local only actions */ /* 1. actions on files AND dirs*/ - m_AddCurrent = new KAction(i18n("Add selected files/dirs"), - "tdesvnadd",KShortcut(Key_Insert),m_SvnWrapper,TQT_SLOT(slotAdd()),m_filesAction,"make_svn_add"); + m_AddCurrent = new TDEAction(i18n("Add selected files/dirs"), + "tdesvnadd",TDEShortcut(Key_Insert),m_SvnWrapper,TQT_SLOT(slotAdd()),m_filesAction,"make_svn_add"); m_AddCurrent->setToolTip(i18n("Adding selected files and/or directories to repository")); - tmp_action = new KAction("Add selected files/dirs recursive", - "tdesvnaddrecursive",KShortcut(CTRL+Key_Insert),m_SvnWrapper,TQT_SLOT(slotAddRec()),m_filesAction,"make_svn_addrec"); + tmp_action = new TDEAction("Add selected files/dirs recursive", + "tdesvnaddrecursive",TDEShortcut(CTRL+Key_Insert),m_SvnWrapper,TQT_SLOT(slotAddRec()),m_filesAction,"make_svn_addrec"); tmp_action->setToolTip(i18n("Adding selected files and/or directories to repository and all subitems of folders")); - m_DelCurrent = new KAction(i18n("Delete selected files/dirs"),"tdesvndelete", - KShortcut(Key_Delete),TQT_TQOBJECT(this),TQT_SLOT(slotDelete()),m_filesAction,"make_svn_remove"); + m_DelCurrent = new TDEAction(i18n("Delete selected files/dirs"),"tdesvndelete", + TDEShortcut(Key_Delete),TQT_TQOBJECT(this),TQT_SLOT(slotDelete()),m_filesAction,"make_svn_remove"); m_DelCurrent->setToolTip(i18n("Deleting selected files and/or directories from repository")); - m_RevertAction = new KAction(i18n("Revert current changes"),"revert", - KShortcut(),m_SvnWrapper,TQT_SLOT(slotRevert()),m_filesAction,"make_svn_revert"); + m_RevertAction = new TDEAction(i18n("Revert current changes"),"revert", + TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotRevert()),m_filesAction,"make_svn_revert"); - m_ResolvedAction = new KAction(i18n("Mark resolved"),KShortcut(), + m_ResolvedAction = new TDEAction(i18n("Mark resolved"),TDEShortcut(), TQT_TQOBJECT(this),TQT_SLOT(slotResolved()),m_filesAction,"make_resolved"); m_ResolvedAction->setToolTip(i18n("Marking files or dirs resolved")); - tmp_action = new KAction(i18n("Resolve conflicts"),KShortcut(), + tmp_action = new TDEAction(i18n("Resolve conflicts"),TDEShortcut(), TQT_TQOBJECT(this),TQT_SLOT(slotTryResolve()),m_filesAction,"make_try_resolve"); - m_IgnoreAction = new KAction(i18n("Ignore/Unignore current item"),KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore"); + m_IgnoreAction = new TDEAction(i18n("Ignore/Unignore current item"),TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore"); - m_UpdateHead = new KAction(i18n("Update to head"),"tdesvnupdate", - KShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate"); - m_UpdateRev = new KAction(i18n("Update to revision..."),"tdesvnupdate", - KShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate"); - m_commitAction = new KAction(i18n("Commit"),"tdesvncommit", - KShortcut("CTRL+#"),m_SvnWrapper,TQT_SLOT(slotCommit()),m_filesAction,"make_svn_commit"); + m_UpdateHead = new TDEAction(i18n("Update to head"),"tdesvnupdate", + TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate"); + m_UpdateRev = new TDEAction(i18n("Update to revision..."),"tdesvnupdate", + TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate"); + m_commitAction = new TDEAction(i18n("Commit"),"tdesvncommit", + TDEShortcut("CTRL+#"),m_SvnWrapper,TQT_SLOT(slotCommit()),m_filesAction,"make_svn_commit"); - tmp_action = new KAction(i18n("Diff local changes"),"tdesvndiff", - KShortcut(CTRL+Key_D),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff"); + tmp_action = new TDEAction(i18n("Diff local changes"),"tdesvndiff", + TDEShortcut(CTRL+Key_D),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff"); tmp_action->setToolTip(i18n("Diff working copy against BASE (last checked out version) - doesn't require access to repository")); - tmp_action = new KAction(i18n("Diff against HEAD"),"tdesvndiff", - KShortcut(CTRL+Key_H),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff"); + tmp_action = new TDEAction(i18n("Diff against HEAD"),"tdesvndiff", + TDEShortcut(CTRL+Key_H),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff"); tmp_action->setToolTip(i18n("Diff working copy against HEAD (last checked in version)- requires access to repository")); - tmp_action = new KAction(i18n("Diff items"),"tdesvndiff", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff"); + tmp_action = new TDEAction(i18n("Diff items"),"tdesvndiff", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff"); tmp_action->setToolTip(i18n("Diff two items")); - m_MergeRevisionAction = new KAction(i18n("Merge two revisions"),"tdesvnmerge", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions"); + m_MergeRevisionAction = new TDEAction(i18n("Merge two revisions"),"tdesvnmerge", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions"); m_MergeRevisionAction->setToolTip(i18n("Merge two revisions of this entry into itself")); - tmp_action=new KAction(i18n("Merge..."),"tdesvnmerge", - KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMerge()),m_filesAction,"make_svn_merge"); + tmp_action=new TDEAction(i18n("Merge..."),"tdesvnmerge", + TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMerge()),m_filesAction,"make_svn_merge"); tmp_action->setToolTip("Merge repository path into current worky copy path or current repository path into a target"); - tmp_action=new KAction( i18n( "Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenWith() ), m_filesAction, "openwith" ); + tmp_action=new TDEAction( i18n( "Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenWith() ), m_filesAction, "openwith" ); /* remote actions only */ - m_CheckoutCurrentAction = new KAction(i18n("Checkout current repository path"),"tdesvncheckout",KShortcut(), + m_CheckoutCurrentAction = new TDEAction(i18n("Checkout current repository path"),"tdesvncheckout",TDEShortcut(), m_SvnWrapper,TQT_SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current"); - m_ExportCurrentAction = new KAction(i18n("Export current repository path"),"tdesvnexport",KShortcut(), + m_ExportCurrentAction = new TDEAction(i18n("Export current repository path"),"tdesvnexport",TDEShortcut(), m_SvnWrapper,TQT_SLOT(slotExportCurrent()),m_filesAction,"make_svn_export_current"); - new KAction(i18n("Select browse revision"),KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision"); + new TDEAction(i18n("Select browse revision"),TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision"); /* independe actions */ - m_CheckoutAction = new KAction(i18n("Checkout a repository"),"tdesvncheckout", - KShortcut(),m_SvnWrapper,TQT_SLOT(slotCheckout()),m_filesAction,"make_svn_checkout"); - m_ExportAction = new KAction(i18n("Export a repository"),"tdesvnexport", - KShortcut(),m_SvnWrapper,TQT_SLOT(slotExport()),m_filesAction,"make_svn_export"); - m_RefreshViewAction = new KAction(i18n("Refresh view"),"reload",KShortcut(Key_F5),TQT_TQOBJECT(this),TQT_SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh"); + m_CheckoutAction = new TDEAction(i18n("Checkout a repository"),"tdesvncheckout", + TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotCheckout()),m_filesAction,"make_svn_checkout"); + m_ExportAction = new TDEAction(i18n("Export a repository"),"tdesvnexport", + TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotExport()),m_filesAction,"make_svn_export"); + m_RefreshViewAction = new TDEAction(i18n("Refresh view"),"reload",TDEShortcut(Key_F5),TQT_TQOBJECT(this),TQT_SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh"); - new KAction(i18n("Diff revisions"),"tdesvndiff",KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff"); + new TDEAction(i18n("Diff revisions"),"tdesvndiff",TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff"); /* folding options */ - tmp_action = new KAction( i18n("Unfold File Tree"), 0, TQT_TQOBJECT(this) , TQT_SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" ); + tmp_action = new TDEAction( i18n("Unfold File Tree"), 0, TQT_TQOBJECT(this) , TQT_SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" ); tmp_action->setToolTip(i18n("Opens all branches of the file tree")); - tmp_action = new KAction( i18n("Fold File Tree"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" ); + tmp_action = new TDEAction( i18n("Fold File Tree"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" ); tmp_action->setToolTip(i18n("Closes all branches of the file tree")); /* caching */ - tmp_action = new KAction( i18n("Update log cache"),0,TQT_TQOBJECT(this),TQT_SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" ); + tmp_action = new TDEAction( i18n("Update log cache"),0,TQT_TQOBJECT(this),TQT_SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" ); tmp_action->setToolTip(i18n("Update the log cache for current repository")); - /* tmp_action = new KAction( i18n("Stop update log cache"),0,this,TQT_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" ); + /* tmp_action = new TDEAction( i18n("Stop update log cache"),0,this,TQT_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" ); tmp_action->setToolTip(i18n("Stop the update of the log cache")); */ @@ -412,7 +412,7 @@ void tdesvnfilelist::setupActions() m_filesAction->setHighlightingEnabled(true); } -KActionCollection*tdesvnfilelist::filesActions() +TDEActionCollection*tdesvnfilelist::filesActions() { return m_filesAction; } @@ -876,7 +876,7 @@ void tdesvnfilelist::enableActions() } bool conflicted = single && allSelected()->at(0)->isConflicted(); - KAction * temp = 0; + TDEAction * temp = 0; /* local and remote actions */ /* 1. actions on dirs AND files */ temp = filesActions()->action("make_svn_log"); @@ -1003,7 +1003,7 @@ void tdesvnfilelist::enableActions() } temp = filesActions()->action("openwith"); if (temp) { - temp->setEnabled(kapp->authorizeKAction("openwith")&&single&&!dir); + temp->setEnabled(kapp->authorizeTDEAction("openwith")&&single&&!dir); } temp = filesActions()->action("update_log_cache"); @@ -1491,7 +1491,7 @@ void tdesvnfilelist::slotContextMenuRequested(TQListViewItem */* _item */, const TDETrader::OfferList offers; OpenContextmenu*me=0; - KAction*temp = 0; + TDEAction*temp = 0; int id = -1; @@ -1670,7 +1670,7 @@ void tdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event) void tdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev) { - KListView::viewportPaintEvent(ev); + TDEListView::viewportPaintEvent(ev); if (m_pList->mOldDropHighlighter.isValid() && ev->rect().intersects(m_pList->mOldDropHighlighter)) { TQPainter painter(viewport()); style().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(), @@ -2707,12 +2707,12 @@ void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) //beginDrag(); } } - KListView::contentsMouseMoveEvent( e ); + TDEListView::contentsMouseMoveEvent( e ); } void tdesvnfilelist::contentsMousePressEvent(TQMouseEvent*e) { - KListView::contentsMousePressEvent(e); + TDEListView::contentsMousePressEvent(e); m_pList->m_fileTip->setItem(0); TQPoint p(contentsToViewport( e->pos())); TQListViewItem *i = itemAt( p ); @@ -2731,7 +2731,7 @@ void tdesvnfilelist::contentsMousePressEvent(TQMouseEvent*e) void tdesvnfilelist::contentsMouseReleaseEvent(TQMouseEvent*e) { - KListView::contentsMouseReleaseEvent(e); + TDEListView::contentsMouseReleaseEvent(e); m_pList->mousePressed = false; } @@ -2742,13 +2742,13 @@ void tdesvnfilelist::contentsWheelEvent( TQWheelEvent * e ) { // when scrolling with mousewheel, stop possible pending filetip m_pList->m_fileTip->setItem(0); - KListView::contentsWheelEvent( e ); + TDEListView::contentsWheelEvent( e ); } void tdesvnfilelist::leaveEvent(TQEvent*e) { m_pList->m_fileTip->setItem( 0 ); - KListView::leaveEvent( e ); + TDEListView::leaveEvent( e ); } void tdesvnfilelist::slotSettingsChanged() @@ -3141,7 +3141,7 @@ void tdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const TQVa void tdesvnfilelist::slotUpdateLogCache() { if (baseUri().length()>0 && m_SvnWrapper->doNetworking()) { - KAction*temp = filesActions()->action("update_log_cache"); + TDEAction*temp = filesActions()->action("update_log_cache"); if (!m_SvnWrapper->threadRunning(SvnActions::fillcachethread)) { m_SvnWrapper->startFillCache(baseUri()); diff --git a/src/svnfrontend/tdesvnfilelist.h b/src/svnfrontend/tdesvnfilelist.h index 529bcb2..53750ec 100644 --- a/src/svnfrontend/tdesvnfilelist.h +++ b/src/svnfrontend/tdesvnfilelist.h @@ -32,9 +32,9 @@ #include #include -class KAction; -class KActionMenu; -class KActionCollection; +class TDEAction; +class TDEActionMenu; +class TDEActionCollection; class KDialog; class KDialogBase; class KdesvnFileListPrivate; @@ -50,13 +50,13 @@ namespace svn { /** @author Rajko Albrecht */ -class tdesvnfilelist : public KListView,public ItemDisplay +class tdesvnfilelist : public TDEListView,public ItemDisplay { Q_OBJECT friend class FileListViewItem; public: - tdesvnfilelist(KActionCollection*,TQWidget *parent = 0, const char *name = 0); + tdesvnfilelist(TDEActionCollection*,TQWidget *parent = 0, const char *name = 0); virtual ~tdesvnfilelist(); virtual bool openURL( const KURL &url,bool noReinit=false ); @@ -66,7 +66,7 @@ public: virtual TQWidget*realWidget(); - KActionCollection*filesActions(); + TDEActionCollection*filesActions(); bool refreshItem(FileListViewItem*); protected: @@ -74,14 +74,14 @@ protected: bool m_deletePerfect; TQMap m_Dirsread; - KActionCollection* m_filesAction; - KAction*m_BlameAction,*m_BlameRangeAction,*m_CatAction,*m_MkdirAction; - KAction*m_InfoAction,*m_commitAction,*m_UpdateHead,*m_UpdateRev; - KAction*m_AddCurrent,*m_DelCurrent,*m_CheckoutAction,*m_CheckoutCurrentAction,*m_RevertAction; - KAction*m_changeToRepository,*m_switchRepository,*m_ExportAction,*m_ExportCurrentAction; - KAction*m_CleanupAction,*m_ResolvedAction,*m_ImportDirsIntoCurrent,*m_RefreshViewAction,*m_MergeRevisionAction; - KAction*m_RenameAction,*m_CopyAction; - KAction*m_LockAction,*m_UnlockAction,*m_IgnoreAction; + TDEActionCollection* m_filesAction; + TDEAction*m_BlameAction,*m_BlameRangeAction,*m_CatAction,*m_MkdirAction; + TDEAction*m_InfoAction,*m_commitAction,*m_UpdateHead,*m_UpdateRev; + TDEAction*m_AddCurrent,*m_DelCurrent,*m_CheckoutAction,*m_CheckoutCurrentAction,*m_RevertAction; + TDEAction*m_changeToRepository,*m_switchRepository,*m_ExportAction,*m_ExportCurrentAction; + TDEAction*m_CleanupAction,*m_ResolvedAction,*m_ImportDirsIntoCurrent,*m_RefreshViewAction,*m_MergeRevisionAction; + TDEAction*m_RenameAction,*m_CopyAction; + TDEAction*m_LockAction,*m_UnlockAction,*m_IgnoreAction; SvnActions*m_SvnWrapper; diff --git a/src/tdesvn.cpp b/src/tdesvn.cpp index 3bbb7fa..d385a6b 100644 --- a/src/tdesvn.cpp +++ b/src/tdesvn.cpp @@ -87,11 +87,11 @@ tdesvn::tdesvn() m_BookmarkManager->setShowNSBookmarks(false); m_BookmarkManager->setEditorOptions(TQString::fromLatin1("KDE Svn"),false); - m_BookmarksActionmenu = new KActionMenu(i18n("&Bookmarks"),"bookmark",actionCollection(),"bookmarks"); + m_BookmarksActionmenu = new TDEActionMenu(i18n("&Bookmarks"),"bookmark",actionCollection(),"bookmarks"); m_BookmarksActionmenu->setDelayed(false); m_BookmarksActionmenu->setEnabled(true); - m_Bookmarkactions = new KActionCollection( this ); + m_Bookmarkactions = new TDEActionCollection( this ); m_Bookmarkactions->setHighlightingEnabled( true ); connectActionCollection( m_Bookmarkactions ); @@ -121,24 +121,24 @@ tdesvn::tdesvn() // tell the KParts::MainWindow that this is indeed the main widget setCentralWidget(m_part->widget()); - KAction*tmpAction; - tmpAction = new KAction(i18n("Create and open new repository"),"filenew", - KShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotCreateRepo()),actionCollection(),"subversion_create_repo"); + TDEAction*tmpAction; + tmpAction = new TDEAction(i18n("Create and open new repository"),"filenew", + TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotCreateRepo()),actionCollection(),"subversion_create_repo"); tmpAction->setToolTip(i18n("Create and opens a new local subversion repository")); - tmpAction = new KAction(i18n("Dump repository to file"),"filenew", - KShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotDumpRepo()),actionCollection(),"subversion_dump_repo"); + tmpAction = new TDEAction(i18n("Dump repository to file"),"filenew", + TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotDumpRepo()),actionCollection(),"subversion_dump_repo"); tmpAction->setToolTip(i18n("Dump a subversion repository to a file")); - tmpAction = new KAction(i18n("Hotcopy a repository"),"filenew", - KShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotHotcopy()),actionCollection(),"subversion_hotcopy_repo"); + tmpAction = new TDEAction(i18n("Hotcopy a repository"),"filenew", + TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotHotcopy()),actionCollection(),"subversion_hotcopy_repo"); tmpAction->setToolTip(i18n("Hotcopy a subversion repository to a new folder")); - tmpAction = new KAction(i18n("Load dump into repository"),"filenew", - KShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotLoaddump()),actionCollection(),"subversion_load_repo"); + tmpAction = new TDEAction(i18n("Load dump into repository"),"filenew", + TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotLoaddump()),actionCollection(),"subversion_load_repo"); tmpAction->setToolTip(i18n("Load a dump file into a repository.")); - tmpAction = new KAction(i18n("Add ssh identities to ssh-agent"),"password", - KShortcut(),TQT_TQOBJECT(m_part),TQT_SLOT(slotSshAdd()),actionCollection(),"tdesvn_ssh_add"); + tmpAction = new TDEAction(i18n("Add ssh identities to ssh-agent"),"password", + TDEShortcut(),TQT_TQOBJECT(m_part),TQT_SLOT(slotSshAdd()),actionCollection(),"tdesvn_ssh_add"); tmpAction->setToolTip(i18n("Force add ssh-identities to ssh-agent for future use.")); - tmpAction = new KAction(i18n("Info about tdesvn part"), "tdesvn", - KShortcut(), TQT_TQOBJECT(m_part), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart"); + tmpAction = new TDEAction(i18n("Info about tdesvn part"), "tdesvn", + TDEShortcut(), TQT_TQOBJECT(m_part), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart"); tmpAction->setToolTip(i18n("Shows info about the tdesvn plugin not the standalone app.")); /* enable tooltips in statusbar for menu */ @@ -166,7 +166,7 @@ tdesvn::tdesvn() setAutoSaveSettings(); } -void tdesvn::connectActionCollection( KActionCollection *coll ) +void tdesvn::connectActionCollection( TDEActionCollection *coll ) { if (!coll)return; connect( coll, TQT_SIGNAL( actionStatusText( const TQString & ) ), @@ -175,7 +175,7 @@ void tdesvn::connectActionCollection( KActionCollection *coll ) this, TQT_SLOT( resetStatusBar() ) ); } -void tdesvn::disconnectActionCollection( KActionCollection *coll ) +void tdesvn::disconnectActionCollection( TDEActionCollection *coll ) { if (!coll)return; } @@ -193,11 +193,11 @@ void tdesvn::load(const KURL& url,bool addRescent) { if (m_part) { bool ret = m_part->openURL(url); - KRecentFilesAction*rac = 0; + TDERecentFilesAction*rac = 0; if (addRescent) { - KAction * ac = actionCollection()->action("file_open_recent"); + TDEAction * ac = actionCollection()->action("file_open_recent"); if (ac) { - rac = (KRecentFilesAction*)ac; + rac = (TDERecentFilesAction*)ac; } } if (!ret) { @@ -219,14 +219,14 @@ void tdesvn::load(const KURL& url,bool addRescent) void tdesvn::setupActions() { - KAction*ac; + TDEAction*ac; KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection()); KStdAction::openNew(TQT_TQOBJECT(this),TQT_SLOT(fileNew()),actionCollection()); ac = KStdAction::close(TQT_TQOBJECT(this),TQT_SLOT(fileClose()),actionCollection()); ac->setEnabled(getMemberList()->count()>1); KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection()); - KRecentFilesAction*rac = KStdAction::openRecent(TQT_TQOBJECT(this),TQT_SLOT(loadRescent(const KURL&)),actionCollection()); + TDERecentFilesAction*rac = KStdAction::openRecent(TQT_TQOBJECT(this),TQT_SLOT(loadRescent(const KURL&)),actionCollection()); if (rac) { rac->setMaxItems(8); @@ -239,8 +239,8 @@ void tdesvn::setupActions() m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection()); - KToggleAction *toggletemp; - toggletemp = new KToggleAction(i18n("Load last opened URL on start"),KShortcut(), + TDEToggleAction *toggletemp; + toggletemp = new TDEToggleAction(i18n("Load last opened URL on start"),TDEShortcut(), actionCollection(),"toggle_load_last_url"); toggletemp->setToolTip(i18n("Reload last opened url if no one is given on commandline")); TDEConfigGroup cs(TDEGlobal::config(),"startup"); @@ -339,7 +339,7 @@ TQString tdesvn::currentURL () const void tdesvn::enableClose(bool how) { - KAction * ac; + TDEAction * ac; if ( (ac=actionCollection()->action("file_close"))) { ac->setEnabled(how); } diff --git a/src/tdesvn.h b/src/tdesvn.h index 47d9f23..7ce9d93 100644 --- a/src/tdesvn.h +++ b/src/tdesvn.h @@ -30,9 +30,9 @@ #include class KURL; -class KAction; -class KActionMenu; -class KToggleAction; +class TDEAction; +class TDEActionMenu; +class TDEToggleAction; class KBookmarkMenu; /** @@ -95,17 +95,17 @@ private slots: private: void setupAccel(); void setupActions(); - void connectActionCollection( KActionCollection *coll ); - void disconnectActionCollection( KActionCollection *coll ); + void connectActionCollection( TDEActionCollection *coll ); + void disconnectActionCollection( TDEActionCollection *coll ); - KActionMenu *m_FileMenu; + TDEActionMenu *m_FileMenu; TQString m_bookmarkFile; KBookmarkManager * m_BookmarkManager; - KActionMenu* m_BookmarksActionmenu; - KActionCollection*m_Bookmarkactions; + TDEActionMenu* m_BookmarksActionmenu; + TDEActionCollection*m_Bookmarkactions; KBookmarkMenu * m_pBookmarkMenu; KParts::ReadOnlyPart *m_part; - KToggleAction *m_statusbarAction; + TDEToggleAction *m_statusbarAction; protected slots: virtual void optionsConfigureToolbars(); diff --git a/src/tdesvn_part.cpp b/src/tdesvn_part.cpp index c8f1e11..cab6e14 100644 --- a/src/tdesvn_part.cpp +++ b/src/tdesvn_part.cpp @@ -177,42 +177,42 @@ TDEAboutData* tdesvnPart::createAboutData() */ void tdesvnPart::setupActions() { - KToggleAction *toggletemp; + TDEToggleAction *toggletemp; - toggletemp = new KToggleAction(i18n("Logs follow node changes"),KShortcut(), + toggletemp = new TDEToggleAction(i18n("Logs follow node changes"),TDEShortcut(), actionCollection(),"toggle_log_follows"); toggletemp->setChecked(Kdesvnsettings::log_follows_nodes()); connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotLogFollowNodes(bool))); - toggletemp = new KToggleAction(i18n("Display ignored files"),KShortcut(), + toggletemp = new TDEToggleAction(i18n("Display ignored files"),TDEShortcut(), actionCollection(),"toggle_ignored_files"); toggletemp->setChecked(Kdesvnsettings::display_ignored_files()); connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotDisplayIgnored(bool))); - toggletemp = new KToggleAction(i18n("Display unknown files"),KShortcut(), + toggletemp = new TDEToggleAction(i18n("Display unknown files"),TDEShortcut(), actionCollection(),"toggle_unknown_files"); toggletemp->setChecked(Kdesvnsettings::display_unknown_files()); connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotDisplayUnkown(bool))); - toggletemp = new KToggleAction(i18n("Hide unchanged files"),KShortcut(), + toggletemp = new TDEToggleAction(i18n("Hide unchanged files"),TDEShortcut(), actionCollection(),"toggle_hide_unchanged_files"); toggletemp->setChecked(Kdesvnsettings::hide_unchanged_files()); connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotHideUnchanged(bool))); - toggletemp = new KToggleAction(i18n("Work online"),KShortcut(), + toggletemp = new TDEToggleAction(i18n("Work online"),TDEShortcut(), actionCollection(),"toggle_network"); toggletemp->setChecked(Kdesvnsettings::network_on()); connect(toggletemp,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotEnableNetwork(bool))); kdDebug()<<"Appname = " << (TQString)kapp->instanceName() << endl; - KAction * t = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection(),"tdesvnpart_pref"); + TDEAction * t = KStdAction::preferences(this, TQT_SLOT(slotShowSettings()), actionCollection(),"tdesvnpart_pref"); t->setText(i18n("&Configure %1...").arg("Kdesvn")); if (TQString(kapp->instanceName())!=TQString("tdesvn")) { - (void)new KAction(i18n("&About tdesvn part"), "tdesvn", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart"); - (void)new KAction(i18n("Kdesvn &Handbook"), "help", 0, this, TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdesvn"); - (void)new KAction(i18n("Send Bugreport for tdesvn"), 0, 0, this, TQT_SLOT(reportBug()), actionCollection(), "report_bug"); + (void)new TDEAction(i18n("&About tdesvn part"), "tdesvn", 0, this, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart"); + (void)new TDEAction(i18n("Kdesvn &Handbook"), "help", 0, this, TQT_SLOT(appHelpActivated()), actionCollection(), "help_tdesvn"); + (void)new TDEAction(i18n("Send Bugreport for tdesvn"), 0, 0, this, TQT_SLOT(reportBug()), actionCollection(), "report_bug"); } actionCollection()->setHighlightingEnabled(true); } @@ -375,20 +375,20 @@ void tdesvnPart::slotShowSettings() */ void tdesvnPart::slotSettingsChanged() { - KAction * temp; + TDEAction * temp; temp = actionCollection()->action("toggle_log_follows"); if (temp) { - ((KToggleAction*)temp)->setChecked(Kdesvnsettings::log_follows_nodes()); + ((TDEToggleAction*)temp)->setChecked(Kdesvnsettings::log_follows_nodes()); } temp = actionCollection()->action("toggle_ignored_files"); if (temp) { - ((KToggleAction*)temp)->setChecked(Kdesvnsettings::display_ignored_files()); + ((TDEToggleAction*)temp)->setChecked(Kdesvnsettings::display_ignored_files()); } #if 0 /// not needed this momenta temp = actionCollection()->action("toggle_unknown_files"); if (temp) { - ((KToggleAction*)temp)->setChecked(tdesvnPart_Prefs::self()->mdisp_unknown_files); + ((TDEToggleAction*)temp)->setChecked(tdesvnPart_Prefs::self()->mdisp_unknown_files); } #endif emit settingsChanged(); diff --git a/src/tdesvnview.cpp b/src/tdesvnview.cpp index 912b788..2e97010 100644 --- a/src/tdesvnview.cpp +++ b/src/tdesvnview.cpp @@ -58,7 +58,7 @@ #include #include -tdesvnView::tdesvnView(KActionCollection*aCollection,TQWidget *parent,const char*name,bool full) +tdesvnView::tdesvnView(TDEActionCollection*aCollection,TQWidget *parent,const char*name,bool full) : TQWidget(parent,name),svn::repository::RepositoryListener(),m_Collection(aCollection), m_currentURL("") { diff --git a/src/tdesvnview.h b/src/tdesvnview.h index 1e0bbbd..0acc8d3 100644 --- a/src/tdesvnview.h +++ b/src/tdesvnview.h @@ -35,7 +35,7 @@ class TQHBoxLayout; class TQGridLayout; class TQSpacerItem; class TQSplitter; -class KActionCollection; +class TDEActionCollection; class KTextBrowser; class KProgress; @@ -57,7 +57,7 @@ public: /** * Default constructor */ - tdesvnView(KActionCollection*,TQWidget *parent,const char*name=0,bool full=false); + tdesvnView(TDEActionCollection*,TQWidget *parent,const char*name=0,bool full=false); /** * Destructor @@ -127,7 +127,7 @@ protected slots: protected: tdesvnfilelist*m_flist; - KActionCollection*m_Collection; + TDEActionCollection*m_Collection; TQSplitter *m_Splitter,*m_infoSplitter; TQString m_currentURL;