diff options
Diffstat (limited to 'src/svnfrontend')
24 files changed, 239 insertions, 239 deletions
diff --git a/src/svnfrontend/CMakeLists.txt b/src/svnfrontend/CMakeLists.txt index 79cac7f..d418547 100644 --- a/src/svnfrontend/CMakeLists.txt +++ b/src/svnfrontend/CMakeLists.txt @@ -39,7 +39,7 @@ SET(svnfrontendsrc hotcopydlg_impl.cpp importdir_logmsg.cpp itemdisplay.cpp - kdesvnfilelist.cpp + tdesvnfilelist.cpp keystatus.cpp loaddmpdlg_impl.cpp mergedlg_impl.cpp diff --git a/src/svnfrontend/blamedisplay_impl.cpp b/src/svnfrontend/blamedisplay_impl.cpp index 3427f05..0c5d9c1 100644 --- a/src/svnfrontend/blamedisplay_impl.cpp +++ b/src/svnfrontend/blamedisplay_impl.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "blamedisplay_impl.h" #include "simple_logcb.h" -#include "src/settings/kdesvnsettings.h" +#include "src/settings/tdesvnsettings.h" #include "src/svnqt/log_entry.hpp" #include "fronthelpers/cursorstack.h" #include "fronthelpers/widgetblockstack.h" @@ -448,7 +448,7 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s KDialogBase * dlg = new KDialogBase( TQT_TQWIDGET(KApplication::activeModalWidget()), name,true,TQString(i18n("Blame %1")).tqarg(item),buttons,KDialogBase::Close,false, - KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"kdesvnlog")); + KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"tdesvnlog")); TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); BlameDisplay_impl*ptr = new BlameDisplay_impl(Dialog1Layout); diff --git a/src/svnfrontend/ccontextlistener.cpp b/src/svnfrontend/ccontextlistener.cpp index 143118b..a27e68f 100644 --- a/src/svnfrontend/ccontextlistener.cpp +++ b/src/svnfrontend/ccontextlistener.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "ccontextlistener.h" -#include "src/settings/kdesvnsettings.h" +#include "src/settings/tdesvnsettings.h" #include "src/ksvnwidgets/authdialogimpl.h" #include "src/ksvnwidgets/logmsg_impl.h" #include "src/ksvnwidgets/ssltrustprompt_impl.h" diff --git a/src/svnfrontend/commandexec.cpp b/src/svnfrontend/commandexec.cpp index fe2f3f7..ab557d2 100644 --- a/src/svnfrontend/commandexec.cpp +++ b/src/svnfrontend/commandexec.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "commandexec.h" -#include "src/settings/kdesvnsettings.h" +#include "src/settings/tdesvnsettings.h" #include "svnfrontend/svnactions.h" #include "svnfrontend/dummydisplay.h" #include "src/svnqt/targets.hpp" @@ -323,9 +323,9 @@ int CommandExec::exec() TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); KTextBrowser*ptr = new KTextBrowser(Dialog1Layout); ptr->setText(m_lastMessages); - dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),"kdesvn_cmd_log")); + dlg.resize(dlg.configDialogSize(*(Kdesvnsettings::self()->config()),"tdesvn_cmd_log")); dlg.exec(); - dlg.saveDialogSize(*(Kdesvnsettings::self()->config()),"kdesvn_cmd_log",false); + dlg.saveDialogSize(*(Kdesvnsettings::self()->config()),"tdesvn_cmd_log",false); } return 0; } diff --git a/src/svnfrontend/filelistviewitem.cpp b/src/svnfrontend/filelistviewitem.cpp index 4747bfd..74fb28a 100644 --- a/src/svnfrontend/filelistviewitem.cpp +++ b/src/svnfrontend/filelistviewitem.cpp @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "filelistviewitem.h" -#include "kdesvnfilelist.h" -#include "src/settings/kdesvnsettings.h" +#include "tdesvnfilelist.h" +#include "src/settings/tdesvnsettings.h" #include "helpers/sub2qt.h" #include "src/svnqt/status.hpp" #include "src/svnqt/revision.hpp" @@ -46,7 +46,7 @@ const int FileListViewItem::COL_IS_LOCKED = 5; //const int FileListViewItem::COL_CURRENT_REV = 5; -FileListViewItem::FileListViewItem(kdesvnfilelist*_parent,const svn::StatusPtr&_stat) +FileListViewItem::FileListViewItem(tdesvnfilelist*_parent,const svn::StatusPtr&_stat) : KListViewItem(_parent),SvnItem(_stat), sortChar(0), m_Ksvnfilelist(_parent) @@ -55,7 +55,7 @@ FileListViewItem::FileListViewItem(kdesvnfilelist*_parent,const svn::StatusPtr&_ init(); } -FileListViewItem::FileListViewItem(kdesvnfilelist*_parent,FileListViewItem*_parentItem,const svn::StatusPtr&_stat) +FileListViewItem::FileListViewItem(tdesvnfilelist*_parent,FileListViewItem*_parentItem,const svn::StatusPtr&_stat) : KListViewItem(_parentItem),SvnItem(_stat), sortChar(0), m_Ksvnfilelist(_parent) @@ -105,7 +105,7 @@ FileListViewItem::~FileListViewItem() if (isSelected()) { /* when item is selected and deleted signal selectionChanged isn't emitted - in TQListView anymore and let kdesvn crash. + in TQListView anymore and let tdesvn crash. */ setSelected(false); m_Ksvnfilelist->selectionChanged(); diff --git a/src/svnfrontend/filelistviewitem.h b/src/svnfrontend/filelistviewitem.h index 3c5780f..f8a95e5 100644 --- a/src/svnfrontend/filelistviewitem.h +++ b/src/svnfrontend/filelistviewitem.h @@ -28,7 +28,7 @@ class TQPainter; class KFileItem; -class kdesvnfilelist; +class tdesvnfilelist; class SvnActions; /** @@ -36,10 +36,10 @@ class SvnActions; */ class FileListViewItem : public KListViewItem,public SvnItem { - friend class kdesvnfilelist; + friend class tdesvnfilelist; public: - FileListViewItem(kdesvnfilelist*,const svn::StatusPtr&); - FileListViewItem(kdesvnfilelist*,FileListViewItem*,const svn::StatusPtr&); + FileListViewItem(tdesvnfilelist*,const svn::StatusPtr&); + FileListViewItem(tdesvnfilelist*,FileListViewItem*,const svn::StatusPtr&); virtual ~FileListViewItem(); virtual int compare( TQListViewItem* i, int col, bool ascending ) const; @@ -71,7 +71,7 @@ public: protected: TQColor m_highColor; short int sortChar; - kdesvnfilelist*m_Ksvnfilelist; + tdesvnfilelist*m_Ksvnfilelist; virtual void update(); diff --git a/src/svnfrontend/fillcachethread.cpp b/src/svnfrontend/fillcachethread.cpp index 56458c3..3f994bf 100644 --- a/src/svnfrontend/fillcachethread.cpp +++ b/src/svnfrontend/fillcachethread.cpp @@ -23,7 +23,7 @@ #include "src/svnqt/cache/LogCache.hpp" #include "src/svnqt/cache/ReposLog.hpp" #include "src/svnqt/cache/DatabaseException.hpp" -#include "src/kdesvn_events.h" +#include "src/tdesvn_events.h" #include <tqobject.h> #include <kdebug.h> diff --git a/src/svnfrontend/fronthelpers/propertylist.cpp b/src/svnfrontend/fronthelpers/propertylist.cpp index 0c7c705..f36721a 100644 --- a/src/svnfrontend/fronthelpers/propertylist.cpp +++ b/src/svnfrontend/fronthelpers/propertylist.cpp @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2007 by Rajko Albrecht ral@alwins-world.de * - * http://kdesvn.alwins-world.de/ * + * http://tdesvn.alwins-world.de/ * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/src/svnfrontend/fronthelpers/propertylist.h b/src/svnfrontend/fronthelpers/propertylist.h index 5751340..49ac137 100644 --- a/src/svnfrontend/fronthelpers/propertylist.h +++ b/src/svnfrontend/fronthelpers/propertylist.h @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright (C) 2007 by Rajko Albrecht ral@alwins-world.de * - * http://kdesvn.alwins-world.de/ * + * http://tdesvn.alwins-world.de/ * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp index 91a72bb..cdd3a08 100644 --- a/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp +++ b/src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "revisionbuttonimpl.h" #include "src/svnfrontend/fronthelpers/rangeinput_impl.h" -#include "src/settings/kdesvnsettings.h" +#include "src/settings/tdesvnsettings.h" #include <kpushbutton.h> #include <kdialog.h> diff --git a/src/svnfrontend/graphtree/drawparams.cpp b/src/svnfrontend/graphtree/drawparams.cpp index 74e4953..7a43dd5 100644 --- a/src/svnfrontend/graphtree/drawparams.cpp +++ b/src/svnfrontend/graphtree/drawparams.cpp @@ -1,6 +1,6 @@ /* This file is part of KCachegrind. Copyright (C) 2002, 2003 Josef Weidendorfer <Josef.Weidendorfer@gmx.de> - Adapted for the needs of kdesvn by Rajko Albrecht <ral@alwins-world.de> + Adapted for the needs of tdesvn by Rajko Albrecht <ral@alwins-world.de> KCachegrind is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff --git a/src/svnfrontend/graphtree/drawparams.h b/src/svnfrontend/graphtree/drawparams.h index eee2445..0244620 100644 --- a/src/svnfrontend/graphtree/drawparams.h +++ b/src/svnfrontend/graphtree/drawparams.h @@ -1,6 +1,6 @@ /* This file is part of KCachegrind. Copyright (C) 2002, 2003 Josef Weidendorfer <Josef.Weidendorfer@gmx.de> - Adapted for the needs of kdesvn by Rajko Albrecht <ral@alwins-world.de> + Adapted for the needs of tdesvn by Rajko Albrecht <ral@alwins-world.de> KCachegrind is free software; you can redistribute it and/or modify it under the terms of the GNU General Public diff --git a/src/svnfrontend/graphtree/revgraphview.cpp b/src/svnfrontend/graphtree/revgraphview.cpp index f98064a..32f8e2d 100644 --- a/src/svnfrontend/graphtree/revgraphview.cpp +++ b/src/svnfrontend/graphtree/revgraphview.cpp @@ -21,7 +21,7 @@ #include "graphtreelabel.h" #include "pannerview.h" #include "graphtree_defines.h" -#include "src/settings/kdesvnsettings.h" +#include "src/settings/tdesvnsettings.h" #include "../stopdlg.h" #include "src/svnqt/client.hpp" diff --git a/src/svnfrontend/graphtree/revisiontree.cpp b/src/svnfrontend/graphtree/revisiontree.cpp index 7a2833a..6932768 100644 --- a/src/svnfrontend/graphtree/revisiontree.cpp +++ b/src/svnfrontend/graphtree/revisiontree.cpp @@ -28,7 +28,7 @@ #include "revgraphview.h" #include "elogentry.h" #include "src/svnfrontend/fronthelpers/cursorstack.h" -#include "src/settings/kdesvnsettings.h" +#include "src/settings/tdesvnsettings.h" #include <kdebug.h> #include <kprogress.h> diff --git a/src/svnfrontend/graphtree/revtreewidget.cpp b/src/svnfrontend/graphtree/revtreewidget.cpp index 3c8d63e..a43b61e 100644 --- a/src/svnfrontend/graphtree/revtreewidget.cpp +++ b/src/svnfrontend/graphtree/revtreewidget.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "revtreewidget.h" -#include "src/settings/kdesvnsettings.h" +#include "src/settings/tdesvnsettings.h" #include <tqvariant.h> #include <tqsplitter.h> diff --git a/src/svnfrontend/itemdisplay.cpp b/src/svnfrontend/itemdisplay.cpp index d037e80..fe2d46a 100644 --- a/src/svnfrontend/itemdisplay.cpp +++ b/src/svnfrontend/itemdisplay.cpp @@ -20,7 +20,7 @@ #include "itemdisplay.h" #include "svnitem.h" -#include "src/settings/kdesvnsettings.h" +#include "src/settings/tdesvnsettings.h" #include "src/svnqt/status.hpp" diff --git a/src/svnfrontend/kdesvnfilelist.cpp b/src/svnfrontend/kdesvnfilelist.cpp index bb966a4..976d3c1 100644 --- a/src/svnfrontend/kdesvnfilelist.cpp +++ b/src/svnfrontend/kdesvnfilelist.cpp @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "kdesvnfilelist.h" -#include "kdesvn_part.h" +#include "tdesvnfilelist.h" +#include "tdesvn_part.h" #include "filelistviewitem.h" #include "importdir_logmsg.h" #include "copymoveview_impl.h" @@ -30,7 +30,7 @@ #include "opencontextmenu.h" #include "checkoutinfo_impl.h" #include "stopdlg.h" -#include "src/settings/kdesvnsettings.h" +#include "src/settings/tdesvnsettings.h" #include "src/svnqt/revision.hpp" #include "src/svnqt/dirent.hpp" #include "src/svnqt/client.hpp" @@ -189,7 +189,7 @@ bool KdesvnFileListPrivate::reReadSettings() _unknown != mdisp_unknown_files); } -kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,TQWidget *parent, const char *name) +tdesvnfilelist::tdesvnfilelist(KActionCollection*aCollect,TQWidget *parent, const char *name) : KListView(parent, name),ItemDisplay(),m_SvnWrapper(new SvnActions(this)) { m_SelectedItems = 0; @@ -248,21 +248,21 @@ kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,TQWidget *parent, cons setAcceptDrops(true); } -svn::Client*kdesvnfilelist::svnclient() +svn::Client*tdesvnfilelist::svnclient() { return m_SvnWrapper->svnclient(); } -void kdesvnfilelist::setupActions() +void tdesvnfilelist::setupActions() { if (!m_filesAction) return; KAction*tmp_action; /* local and remote actions */ /* 1. actions on dirs AND files */ - //new KAction(i18n("Log..."),"kdesvnlog",KShortcut(SHIFT+CTRL+Key_L),this,TQT_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log"); - new KAction(i18n("Full Log"),"kdesvnlog",KShortcut(CTRL+Key_L),TQT_TQOBJECT(this),TQT_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full"); - new KAction(i18n("Full revision tree"),"kdesvnlog",KShortcut(CTRL+Key_T),TQT_TQOBJECT(this),TQT_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree"); - new KAction(i18n("Partial revision tree"),"kdesvnlog",KShortcut(SHIFT+CTRL+Key_T), + //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), TQT_TQOBJECT(this),TQT_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree"); new KAction(i18n("Properties"),"edit", @@ -270,48 +270,48 @@ void kdesvnfilelist::setupActions() new KAction(i18n("Display Properties"),"edit", KShortcut(SHIFT+CTRL+Key_P),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property"); - tmp_action = new KAction(i18n("Display last changes"),"kdesvndiff", + tmp_action = new KAction(i18n("Display last changes"),"tdesvndiff", KShortcut(),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"),"kdesvninfo", + 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"),"kdesvncopy", + 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"),"kdesvncheckupdates",KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates"); + tmp_action = new KAction(i18n("Check for updates"),"tdesvncheckupdates",KShortcut(),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"),"kdesvnblame", + m_BlameAction = new KAction(i18n("Blame"),"tdesvnblame", KShortcut(),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"),"kdesvnblame", + m_BlameRangeAction = new KAction(i18n("Blame range"),"tdesvnblame", KShortcut(),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"), "kdesvncat", + m_CatAction = new KAction(i18n("Cat head"), "tdesvncat", KShortcut(),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..."),"kdesvncat", + tmp_action = new KAction(i18n("Cat revision..."),"tdesvncat", KShortcut(),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"),"kdesvnlock", + 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"),"kdesvnunlock", + m_UnlockAction = new KAction(i18n("Unlock current items"),"tdesvnunlock", KShortcut(),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"),"kdesvnswitch", + m_switchRepository = new KAction(i18n("Switch repository"),"tdesvnswitch", KShortcut(), 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"),"kdesvnrelocate",KShortcut(), + tmp_action = new KAction(i18n("Relocate current working copy url"),"tdesvnrelocate",KShortcut(), 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"),"kdesvnaddrecursive",KShortcut(), + tmp_action = new KAction(i18n("Check for unversioned items"),"tdesvnaddrecursive",KShortcut(), 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.")); @@ -319,7 +319,7 @@ void kdesvnfilelist::setupActions() 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"),"kdesvncleanup", + m_CleanupAction = new KAction(i18n("Cleanup"),"tdesvncleanup", KShortcut(),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(), @@ -329,13 +329,13 @@ void kdesvnfilelist::setupActions() /* local only actions */ /* 1. actions on files AND dirs*/ m_AddCurrent = new KAction(i18n("Add selected files/dirs"), - "kdesvnadd",KShortcut(Key_Insert),m_SvnWrapper,TQT_SLOT(slotAdd()),m_filesAction,"make_svn_add"); + "tdesvnadd",KShortcut(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", - "kdesvnaddrecursive",KShortcut(CTRL+Key_Insert),m_SvnWrapper,TQT_SLOT(slotAddRec()),m_filesAction,"make_svn_addrec"); + "tdesvnaddrecursive",KShortcut(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"),"kdesvndelete", + 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->setToolTip(i18n("Deleting selected files and/or directories from repository")); m_RevertAction = new KAction(i18n("Revert current changes"),"revert", @@ -350,50 +350,50 @@ void kdesvnfilelist::setupActions() m_IgnoreAction = new KAction(i18n("Ignore/Unignore current item"),KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore"); - m_UpdateHead = new KAction(i18n("Update to head"),"kdesvnupdate", + 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..."),"kdesvnupdate", + 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"),"kdesvncommit", + m_commitAction = new KAction(i18n("Commit"),"tdesvncommit", KShortcut("CTRL+#"),m_SvnWrapper,TQT_SLOT(slotCommit()),m_filesAction,"make_svn_commit"); - tmp_action = new KAction(i18n("Diff local changes"),"kdesvndiff", + 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->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"),"kdesvndiff", + 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->setToolTip(i18n("Diff working copy against HEAD (last checked in version)- requires access to repository")); - tmp_action = new KAction(i18n("Diff items"),"kdesvndiff", + tmp_action = new KAction(i18n("Diff items"),"tdesvndiff", KShortcut(),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"),"kdesvnmerge", + m_MergeRevisionAction = new KAction(i18n("Merge two revisions"),"tdesvnmerge", KShortcut(),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..."),"kdesvnmerge", + tmp_action=new KAction(i18n("Merge..."),"tdesvnmerge", KShortcut(),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" ); /* remote actions only */ - m_CheckoutCurrentAction = new KAction(i18n("Checkout current repository path"),"kdesvncheckout",KShortcut(), + m_CheckoutCurrentAction = new KAction(i18n("Checkout current repository path"),"tdesvncheckout",KShortcut(), m_SvnWrapper,TQT_SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current"); - m_ExportCurrentAction = new KAction(i18n("Export current repository path"),"kdesvnexport",KShortcut(), + m_ExportCurrentAction = new KAction(i18n("Export current repository path"),"tdesvnexport",KShortcut(), 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"); /* independe actions */ - m_CheckoutAction = new KAction(i18n("Checkout a repository"),"kdesvncheckout", + 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"),"kdesvnexport", + 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"); - new KAction(i18n("Diff revisions"),"kdesvndiff",KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff"); + new KAction(i18n("Diff revisions"),"tdesvndiff",KShortcut(),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" ); @@ -412,12 +412,12 @@ void kdesvnfilelist::setupActions() m_filesAction->setHighlightingEnabled(true); } -KActionCollection*kdesvnfilelist::filesActions() +KActionCollection*tdesvnfilelist::filesActions() { return m_filesAction; } -FileListViewItemList* kdesvnfilelist::allSelected() +FileListViewItemList* tdesvnfilelist::allSelected() { if (!m_SelectedItems) { m_SelectedItems = new FileListViewItemList; @@ -425,7 +425,7 @@ FileListViewItemList* kdesvnfilelist::allSelected() return m_SelectedItems; } -void kdesvnfilelist::SelectionList(SvnItemList*target) +void tdesvnfilelist::SelectionList(SvnItemList*target) { if (!m_SelectedItems||!target) return; FileListViewItemListIterator iter(*m_SelectedItems); @@ -436,7 +436,7 @@ void kdesvnfilelist::SelectionList(SvnItemList*target) } } -SvnItem*kdesvnfilelist::SelectedOrMain() +SvnItem*tdesvnfilelist::SelectedOrMain() { if (singleSelected()!=0) { return singleSelected(); @@ -447,7 +447,7 @@ SvnItem*kdesvnfilelist::SelectedOrMain() return 0; } -KURL::List kdesvnfilelist::selectedUrls() +KURL::List tdesvnfilelist::selectedUrls() { KURL::List lst; FileListViewItemList*ls = allSelected(); @@ -461,12 +461,12 @@ KURL::List kdesvnfilelist::selectedUrls() return lst; } -TQWidget*kdesvnfilelist::realWidget() +TQWidget*tdesvnfilelist::realWidget() { return this; } -FileListViewItem* kdesvnfilelist::singleSelected() +FileListViewItem* tdesvnfilelist::singleSelected() { if (m_SelectedItems && m_SelectedItems->count()==1) { return m_SelectedItems->at(0); @@ -474,18 +474,18 @@ FileListViewItem* kdesvnfilelist::singleSelected() return 0; } -SvnItem*kdesvnfilelist::Selected() +SvnItem*tdesvnfilelist::Selected() { return singleSelected(); } -void kdesvnfilelist::_openURL(const TQString&url) +void tdesvnfilelist::_openURL(const TQString&url) { openURL(url,true); emit sigUrlChanged(baseUri()); } -bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) +bool tdesvnfilelist::openURL( const KURL &url,bool noReinit ) { CursorStack a; m_SvnWrapper->killallThreads(); @@ -625,7 +625,7 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) return result; } -void kdesvnfilelist::closeMe() +void tdesvnfilelist::closeMe() { m_SvnWrapper->killallThreads(); @@ -646,7 +646,7 @@ void kdesvnfilelist::closeMe() m_pList->m_fileTip->setItem(0); } -bool kdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent) +bool tdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent) { TQString what = _what; svn::StatusEntries dlist; @@ -711,7 +711,7 @@ bool kdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _parent) return true; } -void kdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dlist) +void tdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dlist) { svn::StatusEntries::iterator it; #if 0 @@ -753,7 +753,7 @@ void kdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dl } /* newdir is the NEW directory! just required if local */ -void kdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k) +void tdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k) { if (k) { k->refreshtqStatus(); @@ -810,7 +810,7 @@ void kdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k) } } -kdesvnfilelist::~kdesvnfilelist() +tdesvnfilelist::~tdesvnfilelist() { delete m_pList; delete m_SelectedItems; @@ -818,7 +818,7 @@ kdesvnfilelist::~kdesvnfilelist() ssh.killSshAgent(); } -void kdesvnfilelist::slotItemRead(TQListViewItem*aItem) +void tdesvnfilelist::slotItemRead(TQListViewItem*aItem) { if (!aItem) return; CursorStack a(TQt::BusyCursor); @@ -840,15 +840,15 @@ void kdesvnfilelist::slotItemRead(TQListViewItem*aItem) } } -void kdesvnfilelist::slotReinitItem(SvnItem*item) +void tdesvnfilelist::slotReinitItem(SvnItem*item) { if (!item) { - kdDebug()<<"kdesvnfilelist::slotReinitItem(SvnItem*item): item == null" << endl; + kdDebug()<<"tdesvnfilelist::slotReinitItem(SvnItem*item): item == null" << endl; return; } FileListViewItem*k = item->fItem(); if (!k) { - kdDebug()<<"kdesvnfilelist::slotReinitItem(SvnItem*item): k == null" << endl; + kdDebug()<<"tdesvnfilelist::slotReinitItem(SvnItem*item): k == null" << endl; } refreshItem(k); if (!k) { @@ -860,7 +860,7 @@ void kdesvnfilelist::slotReinitItem(SvnItem*item) } } -void kdesvnfilelist::enableActions() +void tdesvnfilelist::enableActions() { bool isopen = baseUri().length()>0; int c = allSelected()->count(); @@ -1017,7 +1017,7 @@ void kdesvnfilelist::enableActions() } } -void kdesvnfilelist::slotSelectionChanged() +void tdesvnfilelist::slotSelectionChanged() { m_pList->stopProptimer(); if (m_SelectedItems==0) { @@ -1036,9 +1036,9 @@ void kdesvnfilelist::slotSelectionChanged() } /*! - \fn kdesvnfilelist::slotClientException(const TQString&) + \fn tdesvnfilelist::slotClientException(const TQString&) */ -void kdesvnfilelist::slotClientException(const TQString&what) +void tdesvnfilelist::slotClientException(const TQString&what) { emit sigLogMessage(what); KMessageBox::sorry(TQT_TQWIDGET(KApplication::activeModalWidget()),what,i18n("SVN Error")); @@ -1046,15 +1046,15 @@ void kdesvnfilelist::slotClientException(const TQString&what) /*! - \fn kdesvnfilelist::slotNotifyMessage(const TQString&) + \fn tdesvnfilelist::slotNotifyMessage(const TQString&) */ -void kdesvnfilelist::slotNotifyMessage(const TQString&what) +void tdesvnfilelist::slotNotifyMessage(const TQString&what) { emit sigLogMessage(what); kapp->tqprocessEvents(20); } -void kdesvnfilelist::slotChangeToRepository() +void tdesvnfilelist::slotChangeToRepository() { if (!isWorkingCopy()) { return; @@ -1073,7 +1073,7 @@ void kdesvnfilelist::slotChangeToRepository() } } -void kdesvnfilelist::slotItemDoubleClicked(TQListViewItem*item) +void tdesvnfilelist::slotItemDoubleClicked(TQListViewItem*item) { if (!item) return; @@ -1108,7 +1108,7 @@ void kdesvnfilelist::slotItemDoubleClicked(TQListViewItem*item) } } -void kdesvnfilelist::slotCleanupAction() +void tdesvnfilelist::slotCleanupAction() { if (!isWorkingCopy()) return; FileListViewItem*which= singleSelected(); @@ -1119,7 +1119,7 @@ void kdesvnfilelist::slotCleanupAction() } } -void kdesvnfilelist::slotResolved() +void tdesvnfilelist::slotResolved() { if (!isWorkingCopy()) return; FileListViewItem*which= singleSelected(); @@ -1130,7 +1130,7 @@ void kdesvnfilelist::slotResolved() slotRescanIcons(false); } -void kdesvnfilelist::slotTryResolve() +void tdesvnfilelist::slotTryResolve() { if (!isWorkingCopy()) return; FileListViewItem*which= singleSelected(); @@ -1140,7 +1140,7 @@ void kdesvnfilelist::slotTryResolve() m_SvnWrapper->slotResolve(which->fullName()); } -template<class T> KDialogBase* kdesvnfilelist::createDialog(T**ptr,const TQString&_head,bool OkCancel,const char*name,bool showHelp) +template<class T> KDialogBase* tdesvnfilelist::createDialog(T**ptr,const TQString&_head,bool OkCancel,const char*name,bool showHelp) { int buttons = KDialogBase::Ok; if (OkCancel) { @@ -1163,15 +1163,15 @@ template<class T> KDialogBase* kdesvnfilelist::createDialog(T**ptr,const TQStrin return dlg; } -void kdesvnfilelist::slotImportDirsIntoCurrent() +void tdesvnfilelist::slotImportDirsIntoCurrent() { slotImportIntoCurrent(true); } /*! - \fn kdesvnfilelist::slotImportIntoCurrent() + \fn tdesvnfilelist::slotImportIntoCurrent() */ -void kdesvnfilelist::slotImportIntoCurrent(bool dirs) +void tdesvnfilelist::slotImportIntoCurrent(bool dirs) { if (allSelected()->count()>1) { KMessageBox::error(this,i18n("Cannot import into multiple targets!")); @@ -1196,7 +1196,7 @@ void kdesvnfilelist::slotImportIntoCurrent(bool dirs) slotImportIntoDir(uri,targetUri,dirs); } -void kdesvnfilelist::slotImportIntoDir(const KURL&importUrl,const TQString&target,bool dirs) +void tdesvnfilelist::slotImportIntoDir(const KURL&importUrl,const TQString&target,bool dirs) { Logmsg_impl*ptr; Importdir_logmsg*ptr2 = 0; @@ -1255,12 +1255,12 @@ void kdesvnfilelist::slotImportIntoDir(const KURL&importUrl,const TQString&targe delete dlg; } -void kdesvnfilelist::readSupportData() +void tdesvnfilelist::readSupportData() { - /// this moment empty cause no usagedata explicit used by kdesvnfilelist + /// this moment empty cause no usagedata explicit used by tdesvnfilelist } -void kdesvnfilelist::refreshCurrentTree() +void tdesvnfilelist::refreshCurrentTree() { TQTime t; t.start(); @@ -1291,7 +1291,7 @@ void kdesvnfilelist::refreshCurrentTree() //m_pList->startScan(); } -void kdesvnfilelist::refreshCurrent(SvnItem*cur) +void tdesvnfilelist::refreshCurrent(SvnItem*cur) { if (!cur||!cur->fItem()) { refreshCurrentTree(); @@ -1304,7 +1304,7 @@ void kdesvnfilelist::refreshCurrent(SvnItem*cur) viewport()->tqrepaint(); } -bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) +bool tdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) { FileListViewItem*item; if (_parent) { @@ -1424,7 +1424,7 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) return dispchanged; } -KTrader::OfferList kdesvnfilelist::offersList(SvnItem*item,bool execOnly) +KTrader::OfferList tdesvnfilelist::offersList(SvnItem*item,bool execOnly) { KTrader::OfferList offers; if (!item) { @@ -1441,7 +1441,7 @@ KTrader::OfferList kdesvnfilelist::offersList(SvnItem*item,bool execOnly) return offers; } -void kdesvnfilelist::slotContextMenuRequested(TQListViewItem */* _item */, const TQPoint &, int) +void tdesvnfilelist::slotContextMenuRequested(TQListViewItem */* _item */, const TQPoint &, int) { // FileListViewItem*item = static_cast<FileListViewItem*>(_item); bool isopen = baseUri().length()>0; @@ -1523,7 +1523,7 @@ void kdesvnfilelist::slotContextMenuRequested(TQListViewItem */* _item */, const /** * Overridden virtuals for TQt drag 'n drop (XDND) */ -void kdesvnfilelist::contentsDragEnterEvent(TQDragEnterEvent *event) +void tdesvnfilelist::contentsDragEnterEvent(TQDragEnterEvent *event) { TQListViewItem*item; bool ok = validDropEvent(event,item); @@ -1534,8 +1534,8 @@ void kdesvnfilelist::contentsDragEnterEvent(TQDragEnterEvent *event) } } -//void kdesvnfilelist::startDrag() -TQDragObject* kdesvnfilelist::dragObject() +//void tdesvnfilelist::startDrag() +TQDragObject* tdesvnfilelist::dragObject() { m_pList->m_fileTip->setItem(0); TQListViewItem * m_pressedItem = currentItem(); @@ -1555,7 +1555,7 @@ TQDragObject* kdesvnfilelist::dragObject() bool pixmap0Invalid = !m_pressedItem->pixmap(0) || m_pressedItem->pixmap(0)->isNull(); if (( urls.count() > 1 ) || (pixmap0Invalid)) { int iconSize = Kdesvnsettings::listview_icon_size();; - iconSize = iconSize ? iconSize : kdesvnPartFactory::instance()->iconLoader()->currentSize( KIcon::Small ); // Default = small + iconSize = iconSize ? iconSize : tdesvnPartFactory::instance()->iconLoader()->currentSize( KIcon::Small ); // Default = small pixmap2 = DesktopIcon( "kmultiple", iconSize ); if ( pixmap2.isNull() ) { kdWarning() << "Could not find multiple pixmap" << endl; @@ -1585,17 +1585,17 @@ TQDragObject* kdesvnfilelist::dragObject() return drag; } -void kdesvnfilelist::contentsDragLeaveEvent( TQDragLeaveEvent * ) +void tdesvnfilelist::contentsDragLeaveEvent( TQDragLeaveEvent * ) { cleanHighLighter(); } -bool kdesvnfilelist::acceptDrag(TQDropEvent *event)const +bool tdesvnfilelist::acceptDrag(TQDropEvent *event)const { return KURLDrag::canDecode(event); } -bool kdesvnfilelist::validDropEvent(TQDropEvent*event,TQListViewItem*&item) +bool tdesvnfilelist::validDropEvent(TQDropEvent*event,TQListViewItem*&item) { if (!event) return false; if (!isWorkingCopy()) { @@ -1632,7 +1632,7 @@ bool kdesvnfilelist::validDropEvent(TQDropEvent*event,TQListViewItem*&item) return ok; } -void kdesvnfilelist::contentsDropEvent(TQDropEvent * event) +void tdesvnfilelist::contentsDropEvent(TQDropEvent * event) { TQListViewItem *item = 0; bool ok = validDropEvent(event,item); @@ -1644,7 +1644,7 @@ void kdesvnfilelist::contentsDropEvent(TQDropEvent * event) } } -void kdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event) +void tdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event) { TQListViewItem * item; bool ok = validDropEvent(event,item); @@ -1668,7 +1668,7 @@ void kdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event) } } -void kdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev) +void tdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev) { KListView::viewportPaintEvent(ev); if (m_pList->mOldDropHighlighter.isValid() && ev->rect().intersects(m_pList->mOldDropHighlighter)) { @@ -1678,7 +1678,7 @@ void kdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev) } } -void kdesvnfilelist::cleanHighLighter() +void tdesvnfilelist::cleanHighLighter() { if (m_pList->mOldDropHighlighter.isValid()) { TQRect rect=m_pList->mOldDropHighlighter; @@ -1688,9 +1688,9 @@ void kdesvnfilelist::cleanHighLighter() } /*! - \fn kdesvnfilelist::slotMergeRevisions() + \fn tdesvnfilelist::slotMergeRevisions() */ -void kdesvnfilelist::slotMergeRevisions() +void tdesvnfilelist::slotMergeRevisions() { if (!isWorkingCopy()) return; FileListViewItem*which= singleSelected(); @@ -1712,7 +1712,7 @@ void kdesvnfilelist::slotMergeRevisions() refreshRecursive(which); } -void kdesvnfilelist::slotMerge() +void tdesvnfilelist::slotMerge() { FileListViewItem*which= singleSelected(); TQString src1,src2,target; @@ -1739,7 +1739,7 @@ void kdesvnfilelist::slotMerge() if (!dlg) { return; } - dlg->setHelp("merging-items","kdesvn"); + dlg->setHelp("merging-items","tdesvn"); ptr->setDest(target); ptr->setSrc1(src1); ptr->setSrc2(src1); @@ -1779,7 +1779,7 @@ void kdesvnfilelist::slotMerge() delete dlg; } -void kdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item) +void tdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item) { KURL::List urlList; TQMap<TQString,TQString> metaData; @@ -1866,7 +1866,7 @@ void kdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item) } } -void kdesvnfilelist::slotInternalDrop() +void tdesvnfilelist::slotInternalDrop() { TQDropEvent::Action action = m_pList->intern_drop_action; if (action==TQDropEvent::UserAction) { @@ -1896,18 +1896,18 @@ void kdesvnfilelist::slotInternalDrop() } /*! - \fn kdesvnfilelist::slotRename() + \fn tdesvnfilelist::slotRename() */ -void kdesvnfilelist::slotRename() +void tdesvnfilelist::slotRename() { copy_move(true); } -void kdesvnfilelist::slotCopy() +void tdesvnfilelist::slotCopy() { copy_move(false); } -void kdesvnfilelist::copy_move(bool move) +void tdesvnfilelist::copy_move(bool move) { if (isWorkingCopy()&&singleSelected()==firstChild()) { return; @@ -1927,7 +1927,7 @@ void kdesvnfilelist::copy_move(bool move) } } -void kdesvnfilelist::slotCat() +void tdesvnfilelist::slotCat() { FileListViewItem*k = singleSelected(); if (!k) return; @@ -1937,9 +1937,9 @@ void kdesvnfilelist::slotCat() /*! - \fn kdesvnfilelist::slotCopyFinished( KIO::Job *) + \fn tdesvnfilelist::slotCopyFinished( KIO::Job *) */ -void kdesvnfilelist::slotCopyFinished( KIO::Job * job) +void tdesvnfilelist::slotCopyFinished( KIO::Job * job) { if (m_pList->m_DirWatch) { m_pList->m_DirWatch->startScan(false); @@ -1970,9 +1970,9 @@ void kdesvnfilelist::slotCopyFinished( KIO::Job * job) /*! - \fn kdesvnfilelist::slotDelete() + \fn tdesvnfilelist::slotDelete() */ -void kdesvnfilelist::slotDelete() +void tdesvnfilelist::slotDelete() { m_deletePerfect = true; TQPtrList<FileListViewItem>*lst = allSelected(); @@ -2016,9 +2016,9 @@ void kdesvnfilelist::slotDelete() } /*! - \fn kdesvnfilelist::slotDeleteFinished(KIO::Job*) + \fn tdesvnfilelist::slotDeleteFinished(KIO::Job*) */ -void kdesvnfilelist::slotDeleteFinished(KIO::Job*job) +void tdesvnfilelist::slotDeleteFinished(KIO::Job*job) { if (job) { tqApp->exit_loop(); @@ -2030,9 +2030,9 @@ void kdesvnfilelist::slotDeleteFinished(KIO::Job*job) } /*! - \fn kdesvnfilelist::dispDummy() + \fn tdesvnfilelist::dispDummy() */ -void kdesvnfilelist::dispDummy() +void tdesvnfilelist::dispDummy() { // wait for job TQLabel dummy(this,0,WStyle_NoBorder|WShowModal); @@ -2049,9 +2049,9 @@ void kdesvnfilelist::dispDummy() /*! - \fn kdesvnfilelist::slotLock() + \fn tdesvnfilelist::slotLock() */ -void kdesvnfilelist::slotLock() +void tdesvnfilelist::slotLock() { TQPtrList<FileListViewItem>*lst = allSelected(); FileListViewItemListIterator liter(*lst); @@ -2093,9 +2093,9 @@ void kdesvnfilelist::slotLock() /*! - \fn kdesvnfilelist::slotUnlock() + \fn tdesvnfilelist::slotUnlock() */ -void kdesvnfilelist::slotUnlock() +void tdesvnfilelist::slotUnlock() { TQPtrList<FileListViewItem>*lst = allSelected(); FileListViewItemListIterator liter(*lst); @@ -2121,9 +2121,9 @@ void kdesvnfilelist::slotUnlock() /*! - \fn kdesvnfilelist::slotIgnore() + \fn tdesvnfilelist::slotIgnore() */ -void kdesvnfilelist::slotIgnore() +void tdesvnfilelist::slotIgnore() { SvnItem*item = singleSelected(); if (!item || item->isRealVersioned()) return; @@ -2134,9 +2134,9 @@ void kdesvnfilelist::slotIgnore() /*! - \fn kdesvnfilelist::slotBlame() + \fn tdesvnfilelist::slotBlame() */ -void kdesvnfilelist::slotBlame() +void tdesvnfilelist::slotBlame() { SvnItem*k = singleSelected(); if (!k) return; @@ -2147,9 +2147,9 @@ void kdesvnfilelist::slotBlame() /*! - \fn kdesvnfilelist::slotRangeBlame() + \fn tdesvnfilelist::slotRangeBlame() */ -void kdesvnfilelist::slotRangeBlame() +void tdesvnfilelist::slotRangeBlame() { SvnItem*k = singleSelected(); if (!k) return; @@ -2167,7 +2167,7 @@ void kdesvnfilelist::slotRangeBlame() } -void kdesvnfilelist::slotSimpleBaseDiff() +void tdesvnfilelist::slotSimpleBaseDiff() { FileListViewItem*kitem = singleSelected(); if (isWorkingCopy()) @@ -2185,7 +2185,7 @@ void kdesvnfilelist::slotSimpleBaseDiff() m_SvnWrapper->makeDiff(what,svn::Revision::BASE,svn::Revision::WORKING,svn::Revision::UNDEFINED,kitem?kitem->isDir():true); } -void kdesvnfilelist::slotSimpleHeadDiff() +void tdesvnfilelist::slotSimpleHeadDiff() { FileListViewItem*kitem = singleSelected(); TQString what; @@ -2203,7 +2203,7 @@ void kdesvnfilelist::slotSimpleHeadDiff() m_SvnWrapper->makeDiff(what,svn::Revision::WORKING,svn::Revision::HEAD,svn::Revision::UNDEFINED,kitem?kitem->isDir():true); } -void kdesvnfilelist::slotDisplayLastDiff() +void tdesvnfilelist::slotDisplayLastDiff() { FileListViewItem*kitem = singleSelected(); TQString what; @@ -2246,7 +2246,7 @@ void kdesvnfilelist::slotDisplayLastDiff() m_SvnWrapper->makeDiff(what,end,what,start,realWidget()); } -void kdesvnfilelist::slotDiffPathes() +void tdesvnfilelist::slotDiffPathes() { TQPtrList<FileListViewItem>*lst = allSelected(); @@ -2275,9 +2275,9 @@ void kdesvnfilelist::slotDiffPathes() } /*! - \fn kdesvnfilelist::slotMkdir() + \fn tdesvnfilelist::slotMkdir() */ -void kdesvnfilelist::slotMkdir() +void tdesvnfilelist::slotMkdir() { SvnItem*k = singleSelected(); TQString parentDir; @@ -2296,7 +2296,7 @@ void kdesvnfilelist::slotMkdir() } } -void kdesvnfilelist::slotMkBaseDirs() +void tdesvnfilelist::slotMkBaseDirs() { bool isopen = baseUri().length()>0; if (!isopen) { @@ -2307,7 +2307,7 @@ void kdesvnfilelist::slotMkBaseDirs() targets.append(parentDir+"/trunk"); targets.append(parentDir+"/branches"); targets.append(parentDir+"/tags"); - TQString msg = i18n("Automatic generated base tqlayout by kdesvn"); + TQString msg = i18n("Automatic generated base tqlayout by tdesvn"); isopen = m_SvnWrapper->makeMkdir(targets,msg); if (isopen) { slotDirAdded(targets[0],0); @@ -2317,9 +2317,9 @@ void kdesvnfilelist::slotMkBaseDirs() } /*! - \fn kdesvnfilelist::slotDiffRevisions() + \fn tdesvnfilelist::slotDiffRevisions() */ -void kdesvnfilelist::slotDiffRevisions() +void tdesvnfilelist::slotDiffRevisions() { SvnItem*k = singleSelected(); TQString what; @@ -2348,7 +2348,7 @@ void kdesvnfilelist::slotDiffRevisions() } -void kdesvnfilelist::slotSelectBrowsingRevision() +void tdesvnfilelist::slotSelectBrowsingRevision() { if (isWorkingCopy()) return; Rangeinput_impl*rdlg; @@ -2371,9 +2371,9 @@ void kdesvnfilelist::slotSelectBrowsingRevision() } /*! - \fn kdesvnfilelist::slotRevisionCat() + \fn tdesvnfilelist::slotRevisionCat() */ -void kdesvnfilelist::slotRevisionCat() +void tdesvnfilelist::slotRevisionCat() { SvnItem*k = singleSelected(); if (!k) return; @@ -2393,9 +2393,9 @@ void kdesvnfilelist::slotRevisionCat() /*! - \fn kdesvnfilelist::refreshItem(FileListViewItem*) + \fn tdesvnfilelist::refreshItem(FileListViewItem*) */ -bool kdesvnfilelist::refreshItem(FileListViewItem*item) +bool tdesvnfilelist::refreshItem(FileListViewItem*item) { if (!item) { return false; @@ -2411,17 +2411,17 @@ bool kdesvnfilelist::refreshItem(FileListViewItem*item) /*! - \fn kdesvnfilelist::slotCheckUpdates() + \fn tdesvnfilelist::slotCheckUpdates() */ -void kdesvnfilelist::slotCheckUpdates() +void tdesvnfilelist::slotCheckUpdates() { m_SvnWrapper->createUpdateCache(baseUri()); } /*! - \fn kdesvnfilelist::reinitItems(FileListViewItem*_item = 0) + \fn tdesvnfilelist::reinitItems(FileListViewItem*_item = 0) */ -void kdesvnfilelist::reinitItems(FileListViewItem*_item) +void tdesvnfilelist::reinitItems(FileListViewItem*_item) { FileListViewItem*item; if (_item) { @@ -2449,9 +2449,9 @@ void kdesvnfilelist::reinitItems(FileListViewItem*_item) /*! - \fn kdesvnfilelist::slotInfo() + \fn tdesvnfilelist::slotInfo() */ -void kdesvnfilelist::slotInfo() +void tdesvnfilelist::slotInfo() { TQPtrList<SvnItem> lst; SelectionList(&lst); @@ -2473,9 +2473,9 @@ void kdesvnfilelist::slotInfo() /*! - \fn kdesvnfilelist::slotDirItemCreated(const TQString&) + \fn tdesvnfilelist::slotDirItemCreated(const TQString&) */ -void kdesvnfilelist::slotDirItemCreated(const TQString&what) +void tdesvnfilelist::slotDirItemCreated(const TQString&what) { m_pList->stopDirTimer(); m_pList->dirItems[what]='C'; @@ -2484,7 +2484,7 @@ void kdesvnfilelist::slotDirItemCreated(const TQString&what) } -void kdesvnfilelist::updateParents(FileListViewItem*item) +void tdesvnfilelist::updateParents(FileListViewItem*item) { if (!item || !item->parent()) return; FileListViewItem*it = static_cast<FileListViewItem*>(item->parent()); @@ -2493,26 +2493,26 @@ void kdesvnfilelist::updateParents(FileListViewItem*item) } /*! - \fn kdesvnfilelist::slotDirItemDirty(const TQString&) + \fn tdesvnfilelist::slotDirItemDirty(const TQString&) */ -void kdesvnfilelist::slotDirItemDirty(const TQString&what) +void tdesvnfilelist::slotDirItemDirty(const TQString&what) { m_pList->stopDirTimer(); m_pList->dirItems[what]='M'; m_pList->startDirTimer(); } -void kdesvnfilelist::_propListTimeout() +void tdesvnfilelist::_propListTimeout() { dispProperties(false); } -void kdesvnfilelist::slotDisplayProperties() +void tdesvnfilelist::slotDisplayProperties() { dispProperties(true); } -void kdesvnfilelist::dispProperties(bool force) +void tdesvnfilelist::dispProperties(bool force) { CursorStack a(TQt::BusyCursor); bool cache_Only = (!force && isNetworked() && !Kdesvnsettings::properties_on_remote_items()); @@ -2528,7 +2528,7 @@ void kdesvnfilelist::dispProperties(bool force) emit sigProplist(pm,isWorkingCopy(),k->fullName()); } -void kdesvnfilelist::_dirwatchTimeout() +void tdesvnfilelist::_dirwatchTimeout() { kdDebug()<<"dirtimer"<<endl; TQMap<TQString,TQChar>::Iterator it; @@ -2605,9 +2605,9 @@ void kdesvnfilelist::_dirwatchTimeout() } /*! - \fn kdesvnfilelist::slotDirItemDeleted(const TQString&) + \fn tdesvnfilelist::slotDirItemDeleted(const TQString&) */ -void kdesvnfilelist::slotDirItemDeleted(const TQString&what) +void tdesvnfilelist::slotDirItemDeleted(const TQString&what) { m_pList->stopDirTimer(); m_pList->m_fileTip->setItem(0); @@ -2621,7 +2621,7 @@ void kdesvnfilelist::slotDirItemDeleted(const TQString&what) } -void kdesvnfilelist::gotPreview( const KFileItem*, const TQPixmap&) +void tdesvnfilelist::gotPreview( const KFileItem*, const TQPixmap&) { #if 0 FileListViewItem*which = findEntryItem(item->localPath()); @@ -2635,12 +2635,12 @@ void kdesvnfilelist::gotPreview( const KFileItem*, const TQPixmap&) #endif } -void kdesvnfilelist::gotPreviewResult() +void tdesvnfilelist::gotPreviewResult() { // m_previewJob = 0; } -FileListViewItem* kdesvnfilelist::findEntryItem(const TQString&what,FileListViewItem*startAt) +FileListViewItem* tdesvnfilelist::findEntryItem(const TQString&what,FileListViewItem*startAt) { if (!startAt && !what.startsWith(baseUri())) return 0; TQString _what = what; @@ -2671,9 +2671,9 @@ FileListViewItem* kdesvnfilelist::findEntryItem(const TQString&what,FileListView /*! - \fn kdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) + \fn tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) */ -void kdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) +void tdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) { if (!m_pList->mousePressed) { @@ -2710,7 +2710,7 @@ void kdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) KListView::contentsMouseMoveEvent( e ); } -void kdesvnfilelist::contentsMousePressEvent(TQMouseEvent*e) +void tdesvnfilelist::contentsMousePressEvent(TQMouseEvent*e) { KListView::contentsMousePressEvent(e); m_pList->m_fileTip->setItem(0); @@ -2729,29 +2729,29 @@ void kdesvnfilelist::contentsMousePressEvent(TQMouseEvent*e) } } -void kdesvnfilelist::contentsMouseReleaseEvent(TQMouseEvent*e) +void tdesvnfilelist::contentsMouseReleaseEvent(TQMouseEvent*e) { KListView::contentsMouseReleaseEvent(e); m_pList->mousePressed = false; } /*! - \fn kdesvnfilelist::contentsWheelEvent( TQWheelEvent * e ) + \fn tdesvnfilelist::contentsWheelEvent( TQWheelEvent * e ) */ -void kdesvnfilelist::contentsWheelEvent( TQWheelEvent * e ) +void tdesvnfilelist::contentsWheelEvent( TQWheelEvent * e ) { // when scrolling with mousewheel, stop possible pending filetip m_pList->m_fileTip->setItem(0); KListView::contentsWheelEvent( e ); } -void kdesvnfilelist::leaveEvent(TQEvent*e) +void tdesvnfilelist::leaveEvent(TQEvent*e) { m_pList->m_fileTip->setItem( 0 ); KListView::leaveEvent( e ); } -void kdesvnfilelist::slotSettingsChanged() +void tdesvnfilelist::slotSettingsChanged() { m_pList->m_fileTip->setOptions(!isNetworked()&&Kdesvnsettings::display_file_tips()&& TQToolTip::isGloballyEnabled(),true,6); @@ -2769,9 +2769,9 @@ void kdesvnfilelist::slotSettingsChanged() /*! - \fn kdesvnfilelist::slotRelocate() + \fn tdesvnfilelist::slotRelocate() */ -void kdesvnfilelist::slotRelocate() +void tdesvnfilelist::slotRelocate() { if (!isWorkingCopy()) return; SvnItem*k = SelectedOrMain(); @@ -2804,7 +2804,7 @@ void kdesvnfilelist::slotRelocate() refreshItem(k->fItem()); } -void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) +void tdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) { TQDir d; if (_parent) @@ -2875,7 +2875,7 @@ void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) //this->insertDirs(_parent, nonversioned_list); } -void kdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,bool no_update) +void tdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,bool no_update) { FileListViewItem*_s; if (!startAt) { @@ -2907,16 +2907,16 @@ void kdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,boo } } -void kdesvnfilelist::slotRescanIcons(bool checkNewer) +void tdesvnfilelist::slotRescanIcons(bool checkNewer) { rescanIconsRec(0L,checkNewer); } /*! - \fn kdesvnfilelist::slotCheckNewItems() + \fn tdesvnfilelist::slotCheckNewItems() */ -void kdesvnfilelist::slotCheckNewItems() +void tdesvnfilelist::slotCheckNewItems() { if (!isWorkingCopy()) { KMessageBox::sorry(0,i18n("Only in working copy possible."),i18n("Error")); @@ -2935,9 +2935,9 @@ void kdesvnfilelist::slotCheckNewItems() } /*! - \fn kdesvnfilelist::slotMakeRangeLog() + \fn tdesvnfilelist::slotMakeRangeLog() */ -void kdesvnfilelist::slotMakeRangeLog() +void tdesvnfilelist::slotMakeRangeLog() { TQString what; SvnItem*k = SelectedOrMain(); @@ -2963,7 +2963,7 @@ void kdesvnfilelist::slotMakeRangeLog() } -void kdesvnfilelist::slotMakeTree() +void tdesvnfilelist::slotMakeTree() { TQString what; SvnItem*k = SelectedOrMain(); @@ -2979,7 +2979,7 @@ void kdesvnfilelist::slotMakeTree() m_SvnWrapper->makeTree(what,rev); } -void kdesvnfilelist::slotMakePartTree() +void tdesvnfilelist::slotMakePartTree() { TQString what; SvnItem*k = SelectedOrMain(); @@ -3009,9 +3009,9 @@ void kdesvnfilelist::slotMakePartTree() } /*! - \fn kdesvnfilelist::slotMakeLog() + \fn tdesvnfilelist::slotMakeLog() */ -void kdesvnfilelist::slotMakeLog() +void tdesvnfilelist::slotMakeLog() { TQString what; SvnItem*k = SelectedOrMain(); @@ -3034,16 +3034,16 @@ void kdesvnfilelist::slotMakeLog() m_SvnWrapper->makeLog(start,end,(isWorkingCopy()?svn::Revision::UNDEFINED:m_pList->m_remoteRevision),what,list,l); } -const svn::Revision& kdesvnfilelist::remoteRevision()const +const svn::Revision& tdesvnfilelist::remoteRevision()const { return m_pList->m_remoteRevision; } /*! - \fn kdesvnfilelist::slotOpenWith() + \fn tdesvnfilelist::slotOpenWith() */ -void kdesvnfilelist::slotOpenWith() +void tdesvnfilelist::slotOpenWith() { FileListViewItem* which = singleSelected(); if (!which||which->isDir()) { @@ -3055,7 +3055,7 @@ void kdesvnfilelist::slotOpenWith() KRun::displayOpenWithDialog(lst); } -void kdesvnfilelist::slotUnfoldTree() +void tdesvnfilelist::slotUnfoldTree() { StopSimpleDlg sdlg(0,0,i18n("Unfold tree"),i18n("Unfold all folder")); @@ -3092,7 +3092,7 @@ void kdesvnfilelist::slotUnfoldTree() m_SvnWrapper->slotCancel(false); } -void kdesvnfilelist::slotFoldTree() +void tdesvnfilelist::slotFoldTree() { TQListViewItemIterator it(this); while (TQListViewItem* item = it.current()) @@ -3106,9 +3106,9 @@ void kdesvnfilelist::slotFoldTree() } /*! - \fn kdesvnfilelist::uniqueSelected() + \fn tdesvnfilelist::uniqueSelected() */ -bool kdesvnfilelist::uniqueTypeSelected() +bool tdesvnfilelist::uniqueTypeSelected() { FileListViewItemList*ls = allSelected(); FileListViewItemListIterator it(*ls); @@ -3126,7 +3126,7 @@ bool kdesvnfilelist::uniqueTypeSelected() return true; } -void kdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const TQValueList<TQString>&dellist,const TQString&path) +void tdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const TQValueList<TQString>&dellist,const TQString&path) { m_SvnWrapper->changeProperties(pm,dellist,path); FileListViewItem* which = singleSelected(); @@ -3138,7 +3138,7 @@ void kdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const TQVa } } -void kdesvnfilelist::slotUpdateLogCache() +void tdesvnfilelist::slotUpdateLogCache() { if (baseUri().length()>0 && m_SvnWrapper->doNetworking()) { KAction*temp = filesActions()->action("update_log_cache"); @@ -3157,4 +3157,4 @@ void kdesvnfilelist::slotUpdateLogCache() } } -#include "kdesvnfilelist.moc" +#include "tdesvnfilelist.moc" diff --git a/src/svnfrontend/kdesvnfilelist.h b/src/svnfrontend/kdesvnfilelist.h index 73cc3ae..d1a9f78 100644 --- a/src/svnfrontend/kdesvnfilelist.h +++ b/src/svnfrontend/kdesvnfilelist.h @@ -50,14 +50,14 @@ namespace svn { /** @author Rajko Albrecht */ -class kdesvnfilelist : public KListView,public ItemDisplay +class tdesvnfilelist : public KListView,public ItemDisplay { Q_OBJECT TQ_OBJECT friend class FileListViewItem; public: - kdesvnfilelist(KActionCollection*,TQWidget *parent = 0, const char *name = 0); - virtual ~kdesvnfilelist(); + tdesvnfilelist(KActionCollection*,TQWidget *parent = 0, const char *name = 0); + virtual ~tdesvnfilelist(); virtual bool openURL( const KURL &url,bool noReinit=false ); virtual SvnItem*SelectedOrMain(); diff --git a/src/svnfrontend/mergedlg_impl.cpp b/src/svnfrontend/mergedlg_impl.cpp index 44e620a..7caa7c2 100644 --- a/src/svnfrontend/mergedlg_impl.cpp +++ b/src/svnfrontend/mergedlg_impl.cpp @@ -21,7 +21,7 @@ #include "rangeinput_impl.h" #include "src/svnqt/url.hpp" #include "helpers/ktranslateurl.h" -#include "src/settings/kdesvnsettings.h" +#include "src/settings/tdesvnsettings.h" #include <kurlrequester.h> #include <kdialogbase.h> @@ -187,7 +187,7 @@ bool MergeDlg_impl::getMergeRange(Rangeinput_impl::revision_range&range,bool*for KDialogBase dlg(parent,name,true,i18n("Enter merge range"), KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Help, KDialogBase::Ok,true); - dlg.setHelp("merging-items","kdesvn"); + dlg.setHelp("merging-items","tdesvn"); TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); ptr = new MergeDlg_impl(Dialog1Layout,"merge_range_dlg",false,false,false); dlg.resize( TQSize(480,360).expandedTo(dlg.tqminimumSizeHint()) ); diff --git a/src/svnfrontend/stopdlg.cpp b/src/svnfrontend/stopdlg.cpp index 6ec1666..c6487fd 100644 --- a/src/svnfrontend/stopdlg.cpp +++ b/src/svnfrontend/stopdlg.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "stopdlg.h" #include "ccontextlistener.h" -#include "settings/kdesvnsettings.h" +#include "settings/tdesvnsettings.h" #include "helpers/stringhelper.h" #include <kapplication.h> diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index 0d1fd1c..9ca1cc5 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -35,8 +35,8 @@ #include "src/ksvnwidgets/encodingselector_impl.h" #include "src/ksvnwidgets/revertform_impl.h" #include "graphtree/revisiontree.h" -#include "src/settings/kdesvnsettings.h" -#include "src/kdesvn_events.h" +#include "src/settings/tdesvnsettings.h" +#include "src/tdesvn_events.h" #include "src/svnqt/client.hpp" #include "src/svnqt/annotate_line.hpp" #include "src/svnqt/context_listener.hpp" diff --git a/src/svnfrontend/svnfiletip.h b/src/svnfrontend/svnfiletip.h index 27a50ae..21cc01e 100644 --- a/src/svnfrontend/svnfiletip.h +++ b/src/svnfrontend/svnfiletip.h @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ /* this is mostly a copy of KonqFileTip - * when kdesvn get part of KDE itself it should replaced then with the original stuff + * when tdesvn get part of KDE itself it should replaced then with the original stuff * now we make sure we may us it */ diff --git a/src/svnfrontend/svnitem.cpp b/src/svnfrontend/svnitem.cpp index 60a687d..d11e039 100644 --- a/src/svnfrontend/svnitem.cpp +++ b/src/svnfrontend/svnitem.cpp @@ -20,8 +20,8 @@ #include "svnitem.h" #include "svnactions.h" -#include "kdesvn_part.h" -#include "src/settings/kdesvnsettings.h" +#include "tdesvn_part.h" +#include "src/settings/tdesvnsettings.h" #include "src/svnqt/status.hpp" #include "src/svnqt/smart_pointer.hpp" #include "src/svnqt/url.hpp" @@ -241,23 +241,23 @@ TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay) if (p_Item->m_Stat->texttqStatus()==svn_wc_status_conflicted) { m_bgColor = CONFLICT; if (overlay) - p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnconflicted",KIcon::Desktop,size); + p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnconflicted",KIcon::Desktop,size); } else if (p_Item->m_Stat->texttqStatus ()==svn_wc_status_missing) { m_bgColor = MISSING; } else if (isLocked()||wrap->checkReposLockCache(fullName())) { - if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnlocked",KIcon::Desktop,size); + if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnlocked",KIcon::Desktop,size); m_bgColor = LOCKED; } else if (Kdesvnsettings::check_needslock() && !isRemoteAdded() && wrap->isLockNeeded(this,svn::Revision::UNDEFINED) ) { - if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnneedlock",KIcon::Desktop,size); + if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnneedlock",KIcon::Desktop,size); m_bgColor = NEEDLOCK; } else if (wrap->isUpdated(p_Item->m_Stat->path())) { - if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnupdates",KIcon::Desktop,size); + if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnupdates",KIcon::Desktop,size); m_bgColor = UPDATES; } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_deleted) { - if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvndeleted",KIcon::Desktop,size); + if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvndeleted",KIcon::Desktop,size); m_bgColor = DELETED; } else if (p_Item->m_Stat->texttqStatus()==svn_wc_status_added ) { - if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnadded",KIcon::Desktop,size); + if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnadded",KIcon::Desktop,size); m_bgColor = ADDED; } else if (isModified()) { mod = true; @@ -265,19 +265,19 @@ TQPixmap SvnItem::getPixmap(const TQPixmap&_p,int size,bool overlay) svn::StatusEntries dlist; svn::StatusEntries::const_iterator it; if (isRemoteAdded() || wrap->checkUpdateCache(fullName())) { - if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnupdates",KIcon::Desktop,size); + if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnupdates",KIcon::Desktop,size); m_bgColor = UPDATES; } else if (wrap->checkConflictedCache(fullName())) { m_bgColor = CONFLICT; if (overlay) - p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnconflicted",KIcon::Desktop,size); + p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnconflicted",KIcon::Desktop,size); } else { mod = wrap->checkModifiedCache(fullName()); } } if (mod) { m_bgColor = MODIFIED; - if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnmodified",KIcon::Desktop,size); + if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnmodified",KIcon::Desktop,size); } if (!p2.isNull()) { TQPixmap p; @@ -312,7 +312,7 @@ TQPixmap SvnItem::getPixmap(int size,bool overlay) if (isLocked()) { m_bgColor = LOCKED; TQPixmap p2; - if (overlay) p2 = kdesvnPartFactory::instance()->iconLoader()->loadIcon("kdesvnlocked",KIcon::Desktop,size); + if (overlay) p2 = tdesvnPartFactory::instance()->iconLoader()->loadIcon("tdesvnlocked",KIcon::Desktop,size); if (!p2.isNull()) { TQImage i1; i1 = p; TQImage i2; i2 = p2; @@ -323,9 +323,9 @@ TQPixmap SvnItem::getPixmap(int size,bool overlay) } else { if (isRemoteAdded()) { if (isDir()) { - p = kdesvnPartFactory::instance()->iconLoader()->loadIcon("folder",KIcon::Desktop,size); + p = tdesvnPartFactory::instance()->iconLoader()->loadIcon("folder",KIcon::Desktop,size); } else { - p = kdesvnPartFactory::instance()->iconLoader()->loadIcon("unknown",KIcon::Desktop,size); + p = tdesvnPartFactory::instance()->iconLoader()->loadIcon("unknown",KIcon::Desktop,size); } } else { KURL uri; diff --git a/src/svnfrontend/svnlogdlgimp.cpp b/src/svnfrontend/svnlogdlgimp.cpp index b408610..070affa 100644 --- a/src/svnfrontend/svnlogdlgimp.cpp +++ b/src/svnfrontend/svnlogdlgimp.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "svnlogdlgimp.h" -#include "src/settings/kdesvnsettings.h" +#include "src/settings/tdesvnsettings.h" #include "src/svnqt/log_entry.hpp" #include "helpers/sub2qt.h" #include "svnactions.h" |