diff options
Diffstat (limited to 'src/svnfrontend/kdesvnfilelist.cpp')
| -rw-r--r-- | src/svnfrontend/kdesvnfilelist.cpp | 778 |
1 files changed, 389 insertions, 389 deletions
diff --git a/src/svnfrontend/kdesvnfilelist.cpp b/src/svnfrontend/kdesvnfilelist.cpp index d9116cb..ba2249d 100644 --- a/src/svnfrontend/kdesvnfilelist.cpp +++ b/src/svnfrontend/kdesvnfilelist.cpp @@ -61,18 +61,18 @@ #include <kurldrag.h> #include <ktrader.h> -#include <qvbox.h> -#include <qpainter.h> -#include <qstyle.h> -#include <qapplication.h> -#include <qlayout.h> -#include <qlabel.h> -#include <qtooltip.h> -#include <qregexp.h> -#include <qpopupmenu.h> -#include <qcursor.h> -#include <qheader.h> -#include <qcheckbox.h> +#include <tqvbox.h> +#include <tqpainter.h> +#include <tqstyle.h> +#include <tqapplication.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqtooltip.h> +#include <tqregexp.h> +#include <tqpopupmenu.h> +#include <tqcursor.h> +#include <tqheader.h> +#include <tqcheckbox.h> #include <unistd.h> @@ -88,9 +88,9 @@ public: delete m_fileTip; kdDebug()<<"Destructor KdesvnFileListPrivate done"<<endl; }; - QListViewItem *dragOverItem; - QPoint dragOverPoint; - QRect mOldDropHighlighter; + TQListViewItem *dragOverItem; + TQPoint dragOverPoint; + TQRect mOldDropHighlighter; svn::Revision m_remoteRevision; KDirWatch*m_DirWatch; SvnFileTip*m_fileTip; @@ -103,17 +103,17 @@ public: bool intern_dropRunning; KURL::List intern_drops; - QString intern_drop_target,merge_Src1, merge_Src2,merge_Target; - QDropEvent::Action intern_drop_action; - QPoint intern_drop_pos; - QTimer drop_timer; - QTimer dirwatch_timer; - QTimer propTimer; + TQString intern_drop_target,merge_Src1, merge_Src2,merge_Target; + TQDropEvent::Action intern_drop_action; + TQPoint intern_drop_pos; + TQTimer drop_timer; + TQTimer dirwatch_timer; + TQTimer propTimer; bool mousePressed; - QPoint presspos; + TQPoint presspos; - QMap<QString,QChar> dirItems; + TQMap<TQString,TQChar> dirItems; void stopDirTimer() { @@ -125,9 +125,9 @@ public: dirwatch_timer.start(250,true); } - void connectDirTimer(QObject*ob) + void connectDirTimer(TQObject*ob) { - QObject::connect(&dirwatch_timer,SIGNAL(timeout()),ob,SLOT(_dirwatchTimeout())); + TQObject::connect(&dirwatch_timer,TQT_SIGNAL(timeout()),ob,TQT_SLOT(_dirwatchTimeout())); } void stopScan() { @@ -149,9 +149,9 @@ public: { propTimer.stop(); } - void connectPropTimer(QObject*ob) + void connectPropTimer(TQObject*ob) { - QObject::connect(&propTimer,SIGNAL(timeout()),ob,SLOT(_propListTimeout())); + TQObject::connect(&propTimer,TQT_SIGNAL(timeout()),ob,TQT_SLOT(_propListTimeout())); } private: @@ -159,7 +159,7 @@ private: }; KdesvnFileListPrivate::KdesvnFileListPrivate() - : dragOverItem(0),dragOverPoint(QPoint(0,0)),mOldDropHighlighter() + : dragOverItem(0),dragOverPoint(TQPoint(0,0)),mOldDropHighlighter() { m_remoteRevision = svn::Revision::HEAD; m_DirWatch = 0; @@ -189,15 +189,15 @@ bool KdesvnFileListPrivate::reReadSettings() _unknown != mdisp_unknown_files); } -kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,QWidget *parent, const char *name) - : KListView(parent, name),ItemDisplay(),m_SvnWrapper(new SvnActions(this)) +kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,TQWidget *tqparent, const char *name) + : KListView(tqparent, name),ItemDisplay(),m_SvnWrapper(new SvnActions(this)) { m_SelectedItems = 0; m_pList = new KdesvnFileListPrivate; m_filesAction = aCollect; m_pList->m_fileTip=new SvnFileTip(this); m_pList->m_fileTip->setOptions(Kdesvnsettings::display_file_tips()&& - QToolTip::isGloballyEnabled(),true,6); + TQToolTip::isGloballyEnabled(),true,6); SshAgent ssh; ssh.querySshAgent(); @@ -208,7 +208,7 @@ kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,QWidget *parent, const setAllColumnsShowFocus (true); setRootIsDecorated(true); addColumn(i18n("Name")); - addColumn(i18n("Status")); + addColumn(i18n("tqStatus")); addColumn(i18n("Last changed Revision")); addColumn(i18n("Last author")); addColumn(i18n("Last change date")); @@ -216,30 +216,30 @@ kdesvnfilelist::kdesvnfilelist(KActionCollection*aCollect,QWidget *parent, const setSortColumn(FileListViewItem::COL_NAME); setupActions(); - connect(this,SIGNAL(contextMenuRequested(QListViewItem *, const QPoint &, int)),this, - SLOT(slotContextMenuRequested(QListViewItem *, const QPoint &, int))); + connect(this,TQT_SIGNAL(contextMenuRequested(TQListViewItem *, const TQPoint &, int)),this, + TQT_SLOT(slotContextMenuRequested(TQListViewItem *, const TQPoint &, int))); /* not via executed 'cause click may used for selection - single click execution just confuses in an application */ - connect(this,SIGNAL(doubleClicked(QListViewItem*)),this,SLOT(slotItemDoubleClicked(QListViewItem*))); - connect(this,SIGNAL(returnPressed(QListViewItem*)),this,SLOT(slotItemDoubleClicked(QListViewItem*))); - - connect(this,SIGNAL(selectionChanged()),this,SLOT(slotSelectionChanged())); - connect(m_SvnWrapper,SIGNAL(clientException(const QString&)),this,SLOT(slotClientException(const QString&))); - connect(m_SvnWrapper,SIGNAL(sendNotify(const QString&)),this,SLOT(slotNotifyMessage(const QString&))); - connect(m_SvnWrapper,SIGNAL(reinitItem(SvnItem*)),this,SLOT(slotReinitItem(SvnItem*))); - connect(m_SvnWrapper,SIGNAL(sigRefreshAll()),this,SLOT(refreshCurrentTree())); - connect(m_SvnWrapper,SIGNAL(sigRefreshCurrent(SvnItem*)),this,SLOT(refreshCurrent(SvnItem*))); - connect(m_SvnWrapper,SIGNAL(sigRefreshIcons(bool)),this,SLOT(slotRescanIcons(bool))); - connect(this,SIGNAL(dropped (QDropEvent*,QListViewItem*)), - this,SLOT(slotDropped(QDropEvent*,QListViewItem*))); - connect(m_SvnWrapper,SIGNAL(sigGotourl(const QString&)),this,SLOT(_openURL(const QString&))); - - connect(m_SvnWrapper,SIGNAL(sigCacheStatus(Q_LONG,Q_LONG)),this,SIGNAL(sigCacheStatus(Q_LONG,Q_LONG))); - connect(m_SvnWrapper,SIGNAL(sigThreadsChanged()),this,SLOT(enableActions())); - - m_pList->connectDirTimer(this); - m_pList->connectPropTimer(this); + connect(this,TQT_SIGNAL(doubleClicked(TQListViewItem*)),this,TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); + connect(this,TQT_SIGNAL(returnPressed(TQListViewItem*)),this,TQT_SLOT(slotItemDoubleClicked(TQListViewItem*))); + + connect(this,TQT_SIGNAL(selectionChanged()),this,TQT_SLOT(slotSelectionChanged())); + connect(m_SvnWrapper,TQT_SIGNAL(clientException(const TQString&)),this,TQT_SLOT(slotClientException(const TQString&))); + connect(m_SvnWrapper,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&))); + connect(m_SvnWrapper,TQT_SIGNAL(reinitItem(SvnItem*)),this,TQT_SLOT(slotReinitItem(SvnItem*))); + connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshAll()),this,TQT_SLOT(refreshCurrentTree())); + connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshCurrent(SvnItem*)),this,TQT_SLOT(refreshCurrent(SvnItem*))); + connect(m_SvnWrapper,TQT_SIGNAL(sigRefreshIcons(bool)),this,TQT_SLOT(slotRescanIcons(bool))); + connect(this,TQT_SIGNAL(dropped (TQDropEvent*,TQListViewItem*)), + this,TQT_SLOT(slotDropped(TQDropEvent*,TQListViewItem*))); + connect(m_SvnWrapper,TQT_SIGNAL(sigGotourl(const TQString&)),this,TQT_SLOT(_openURL(const TQString&))); + + connect(m_SvnWrapper,TQT_SIGNAL(sigCachetqStatus(TQ_LONG,TQ_LONG)),this,TQT_SIGNAL(sigCachetqStatus(TQ_LONG,TQ_LONG))); + connect(m_SvnWrapper,TQT_SIGNAL(sigThreadsChanged()),this,TQT_SLOT(enableActions())); + + m_pList->connectDirTimer(TQT_TQOBJECT(this)); + m_pList->connectPropTimer(TQT_TQOBJECT(this)); setDropHighlighter(true); setDragEnabled(true); @@ -259,152 +259,152 @@ void kdesvnfilelist::setupActions() KAction*tmp_action; /* local and remote actions */ /* 1. actions on dirs AND files */ - //new KAction(i18n("Log..."),"kdesvnlog",KShortcut(SHIFT+CTRL+Key_L),this,SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log"); - new KAction(i18n("Full Log"),"kdesvnlog",KShortcut(CTRL+Key_L),this,SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full"); - new KAction(i18n("Full revision tree"),"kdesvnlog",KShortcut(CTRL+Key_T),this,SLOT(slotMakeTree()),m_filesAction,"make_svn_tree"); + //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), - this,SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree"); + TQT_TQOBJECT(this),TQT_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree"); new KAction(i18n("Properties"),"edit", - KShortcut(CTRL+Key_P),m_SvnWrapper,SLOT(slotProperties()),m_filesAction,"make_svn_property"); + 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),this,SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property"); + 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", - KShortcut(),this,SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change"); + 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", - KShortcut(CTRL+Key_I),this,SLOT(slotInfo()),m_filesAction,"make_svn_info"); + 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),this,SLOT(slotRename()),m_filesAction,"make_svn_rename"); + KShortcut(Key_F2),TQT_TQOBJECT(this),TQT_SLOT(slotRename()),m_filesAction,"make_svn_rename"); m_CopyAction = new KAction(i18n("Copy"),"kdesvncopy", - KShortcut(CTRL+Key_C),this,SLOT(slotCopy()),m_filesAction,"make_svn_copy"); - tmp_action = new KAction(i18n("Check for updates"),"kdesvncheckupdates",KShortcut(),this,SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates"); + 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->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", - KShortcut(),this,SLOT(slotBlame()),m_filesAction,"make_svn_blame"); + 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", - KShortcut(),this,SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame"); + 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", - KShortcut(),this,SLOT(slotCat()),m_filesAction,"make_svn_cat"); + 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", - KShortcut(),this,SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat"); + 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", - KShortcut(),this,SLOT(slotLock()),m_filesAction,"make_svn_lock"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotLock()),m_filesAction,"make_svn_lock"); m_UnlockAction = new KAction(i18n("Unlock current items"),"kdesvnunlock", - KShortcut(),this,SLOT(slotUnlock()),m_filesAction,"make_svn_unlock"); + 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(),this,SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir"); + KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir"); m_switchRepository = new KAction(i18n("Switch repository"),"kdesvnswitch", - KShortcut(), m_SvnWrapper,SLOT(slotSwitch()),m_filesAction,"make_svn_switch"); + 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(), - this,SLOT(slotRelocate()),m_filesAction,"make_svn_relocate"); + 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(), - this,SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned"); + 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(), - this,SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo"); + 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", - KShortcut(),this,SLOT(slotCleanupAction()),m_filesAction,"make_cleanup"); + 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(), - this,SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current"); + 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"), - "kdesvnadd",KShortcut(Key_Insert),m_SvnWrapper,SLOT(slotAdd()),m_filesAction,"make_svn_add"); + "kdesvnadd",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,SLOT(slotAddRec()),m_filesAction,"make_svn_addrec"); + "kdesvnaddrecursive",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", - KShortcut(Key_Delete),this,SLOT(slotDelete()),m_filesAction,"make_svn_remove"); + 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", - KShortcut(),m_SvnWrapper,SLOT(slotRevert()),m_filesAction,"make_svn_revert"); + KShortcut(),m_SvnWrapper,TQT_SLOT(slotRevert()),m_filesAction,"make_svn_revert"); m_ResolvedAction = new KAction(i18n("Mark resolved"),KShortcut(), - this,SLOT(slotResolved()),m_filesAction,"make_resolved"); + 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(), - this,SLOT(slotTryResolve()),m_filesAction,"make_try_resolve"); + TQT_TQOBJECT(this),TQT_SLOT(slotTryResolve()),m_filesAction,"make_try_resolve"); - m_IgnoreAction = new KAction(i18n("Ignore/Unignore current item"),KShortcut(),this,SLOT(slotIgnore()),m_filesAction,"make_svn_ignore"); + 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", - KShortcut(),m_SvnWrapper,SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate"); + KShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate"); m_UpdateRev = new KAction(i18n("Update to revision..."),"kdesvnupdate", - KShortcut(),m_SvnWrapper,SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate"); + KShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateTo()),m_filesAction,"make_svn_revupdate"); m_commitAction = new KAction(i18n("Commit"),"kdesvncommit", - KShortcut("CTRL+#"),m_SvnWrapper,SLOT(slotCommit()),m_filesAction,"make_svn_commit"); + KShortcut("CTRL+#"),m_SvnWrapper,TQT_SLOT(slotCommit()),m_filesAction,"make_svn_commit"); tmp_action = new KAction(i18n("Diff local changes"),"kdesvndiff", - KShortcut(CTRL+Key_D),this,SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff"); + 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", - KShortcut(CTRL+Key_H),this,SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff"); + 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", - KShortcut(),this,SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff"); + 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", - KShortcut(),this,SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions"); + 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", - KShortcut(),this,SLOT(slotMerge()),m_filesAction,"make_svn_merge"); + 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, this, SLOT( slotOpenWith() ), m_filesAction, "openwith" ); + 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_SvnWrapper,SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current"); + m_SvnWrapper,TQT_SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current"); m_ExportCurrentAction = new KAction(i18n("Export current repository path"),"kdesvnexport",KShortcut(), - m_SvnWrapper,SLOT(slotExportCurrent()),m_filesAction,"make_svn_export_current"); - new KAction(i18n("Select browse revision"),KShortcut(),this,SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision"); + 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", - KShortcut(),m_SvnWrapper,SLOT(slotCheckout()),m_filesAction,"make_svn_checkout"); + KShortcut(),m_SvnWrapper,TQT_SLOT(slotCheckout()),m_filesAction,"make_svn_checkout"); m_ExportAction = new KAction(i18n("Export a repository"),"kdesvnexport", - KShortcut(),m_SvnWrapper,SLOT(slotExport()),m_filesAction,"make_svn_export"); - m_RefreshViewAction = new KAction(i18n("Refresh view"),"reload",KShortcut(Key_F5),this,SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh"); + 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(),this,SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff"); + new KAction(i18n("Diff revisions"),"kdesvndiff",KShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff"); /* folding options */ - tmp_action = new KAction( i18n("Unfold File Tree"), 0, this , SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" ); + tmp_action = new KAction( 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, this, SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" ); + tmp_action = new KAction( 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,this,SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" ); + tmp_action = new KAction( 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,SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" ); + /* tmp_action = new KAction( 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")); */ @@ -461,7 +461,7 @@ KURL::List kdesvnfilelist::selectedUrls() return lst; } -QWidget*kdesvnfilelist::realWidget() +TQWidget*kdesvnfilelist::realWidget() { return this; } @@ -479,7 +479,7 @@ SvnItem*kdesvnfilelist::Selected() return singleSelected(); } -void kdesvnfilelist::_openURL(const QString&url) +void kdesvnfilelist::_openURL(const TQString&url) { openURL(url,true); emit sigUrlChanged(baseUri()); @@ -490,7 +490,7 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) CursorStack a; m_SvnWrapper->killallThreads(); clear(); - emit sigProplist(svn::PathPropertiesMapListPtr(new svn::PathPropertiesMapList()),false,QString("")); + emit sigProplist(svn::PathPropertiesMapListPtr(new svn::PathPropertiesMapList()),false,TQString("")); m_Dirsread.clear(); if (m_SelectedItems) { m_SelectedItems->clear(); @@ -503,15 +503,15 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) if (!noReinit) m_SvnWrapper->reInitClient(); - QString query = url.query(); + TQString query = url.query(); KURL _url = url; - QString proto = svn::Url::transformProtokoll(url.protocol()); + TQString proto = svn::Url::transformProtokoll(url.protocol()); _url.cleanPath(true); _url.setProtocol(proto); proto = _url.url(-1); - QStringList s = QStringList::split("?",proto); + TQStringList s = TQStringList::split("?",proto); if (s.size()>1) { setBaseUri(s[0]); } else { @@ -523,19 +523,19 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) m_pList->m_remoteRevision=svn::Revision::HEAD; - QString _dummy; + TQString _dummy; - if (!QString::compare("svn+file",url.protocol())) { + if (!TQString::compare("svn+file",url.protocol())) { setBaseUri("file://"+url.path()); } else { if (url.isLocalFile()) { - QString s = url.path(); + TQString s = url.path(); while(s.endsWith("/")) { s.remove(s.length()-1,1); } - QFileInfo fi(s); + TQFileInfo fi(s); if (fi.exists() && fi.isSymLink()) { - QString sl = fi.readLink(); + TQString sl = fi.readLink(); if (sl.startsWith("/")) { setBaseUri(sl); } else { @@ -567,9 +567,9 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) } } if (query.length()>1) { - QMap<QString,QString> q = url.queryItems(); - if (q.find("rev")!=q.end()) { - QString v = q["rev"]; + TQMap<TQString,TQString> q = url.queryItems(); + if (q.tqfind("rev")!=q.end()) { + TQString v = q["rev"]; svn::Revision tmp; m_SvnWrapper->svnclient()->url2Revision(v,m_pList->m_remoteRevision,tmp); if (m_pList->m_remoteRevision==svn::Revision::UNDEFINED) { @@ -585,10 +585,10 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) } m_SvnWrapper->clearUpdateCache(); if (isWorkingCopy()) { - m_pList->m_DirWatch=new KDirWatch(this); - connect(m_pList->m_DirWatch,SIGNAL(dirty(const QString&)),this,SLOT(slotDirItemDirty(const QString&))); - connect(m_pList->m_DirWatch,SIGNAL(created(const QString&)),this,SLOT(slotDirItemCreated(const QString&))); - connect(m_pList->m_DirWatch,SIGNAL(deleted(const QString&)),this,SLOT(slotDirItemDeleted(const QString&))); + m_pList->m_DirWatch=new KDirWatch(TQT_TQOBJECT(this)); + connect(m_pList->m_DirWatch,TQT_SIGNAL(dirty(const TQString&)),this,TQT_SLOT(slotDirItemDirty(const TQString&))); + connect(m_pList->m_DirWatch,TQT_SIGNAL(created(const TQString&)),this,TQT_SLOT(slotDirItemCreated(const TQString&))); + connect(m_pList->m_DirWatch,TQT_SIGNAL(deleted(const TQString&)),this,TQT_SLOT(slotDirItemDeleted(const TQString&))); /* seems that recursive does not work */ if (m_pList->m_DirWatch) { m_pList->m_DirWatch->addDir(baseUri()+"/",false,false); @@ -606,7 +606,7 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) clear(); } m_pList->m_fileTip->setOptions(!isNetworked()&&Kdesvnsettings::display_file_tips()&& - QToolTip::isGloballyEnabled(),true,6); + TQToolTip::isGloballyEnabled(),true,6); if (result && isWorkingCopy()) { m_SvnWrapper->createModifiedCache(baseUri()); @@ -620,7 +620,7 @@ bool kdesvnfilelist::openURL( const KURL &url,bool noReinit ) } emit changeCaption(baseUri()); emit sigUrlOpend(result); - QTimer::singleShot(1,this,SLOT(readSupportData())); + TQTimer::singleShot(1,this,TQT_SLOT(readSupportData())); enableActions(); return result; } @@ -646,28 +646,28 @@ void kdesvnfilelist::closeMe() m_pList->m_fileTip->setItem(0); } -bool kdesvnfilelist::checkDirs(const QString&_what,FileListViewItem * _parent) +bool kdesvnfilelist::checkDirs(const TQString&_what,FileListViewItem * _tqparent) { - QString what = _what; + TQString what = _what; svn::StatusEntries dlist; while (what.endsWith("/")) { what.truncate(what.length()-1); } // prevent this from checking unversioned folder. FIXME: what happen when we do open url on a non-working-copy folder?? - if (!isWorkingCopy()|| (!_parent) || ((_parent) && (_parent->isVersioned()))) { - if (!m_SvnWrapper->makeStatus(what,dlist,m_pList->m_remoteRevision) ) { - kdDebug() << "unable makeStatus" <<endl; + if (!isWorkingCopy()|| (!_tqparent) || ((_tqparent) && (_tqparent->isVersioned()))) { + if (!m_SvnWrapper->maketqStatus(what,dlist,m_pList->m_remoteRevision) ) { + kdDebug() << "unable maketqStatus" <<endl; return false; } } else { - checkUnversionedDirs(_parent); + checkUnversionedDirs(_tqparent); return true; } svn::StatusEntries neweritems; m_SvnWrapper->getaddedItems(what,neweritems); dlist+=neweritems; bool ownupdates = true; - //kdDebug() << "makeStatus on " << what << " created: " << dlist.count() << "items" <<endl; + //kdDebug() << "maketqStatus on " << what << " created: " << dlist.count() << "items" <<endl; if (isUpdatesEnabled()) { viewport()->setUpdatesEnabled(false); @@ -682,15 +682,15 @@ bool kdesvnfilelist::checkDirs(const QString&_what,FileListViewItem * _parent) // current item is not versioned if (!(*it)->isVersioned() && !filterOut((*it))) { - // if empty, we may want to create a default svn::Status for each folder inside this _parent - // iterate over QDir and create new filelistviewitem - checkUnversionedDirs(_parent); + // if empty, we may want to create a default svn::tqStatus for each folder inside this _tqparent + // iterate over TQDir and create new filelistviewitem + checkUnversionedDirs(_tqparent); } - if ((*it)->path()==what||QString::compare((*it)->entry().url(),what)==0){ - if (!_parent) { + if ((*it)->path()==what||TQString::compare((*it)->entry().url(),what)==0){ + if (!_tqparent) { pitem = new FileListViewItem(this,*it); - //kdDebug()<< "CheckDirs::creating new FileListViewitem as parent " + (*it)->path() << endl; + //kdDebug()<< "CheckDirs::creating new FileListViewitem as tqparent " + (*it)->path() << endl; m_Dirsread[pitem->fullName()]=true; pitem->setDropEnabled(true); } @@ -699,31 +699,31 @@ bool kdesvnfilelist::checkDirs(const QString&_what,FileListViewItem * _parent) break; } } - if (_parent) { - pitem = _parent; + if (_tqparent) { + pitem = _tqparent; } insertDirs(pitem,dlist); if (ownupdates) { kdDebug()<<"Enable update"<<endl; viewport()->setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); } return true; } -void kdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dlist) +void kdesvnfilelist::insertDirs(FileListViewItem * _tqparent,svn::StatusEntries&dlist) { svn::StatusEntries::iterator it; #if 0 KFileItemList oneItem; #endif - QTime _t; + TQTime _t; _t.start(); for (it = dlist.begin();it!=dlist.end();++it) { /* if (_t.elapsed()>300) { viewport()->setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); viewport()->setUpdatesEnabled(false); _t.restart(); }*/ @@ -732,13 +732,13 @@ void kdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dl continue; } FileListViewItem * item; - if (!_parent) { + if (!_tqparent) { item = new FileListViewItem(this,*it); } else { - if ( (item = _parent->findChild( (*it)->path() )) ) { + if ( (item = _tqparent->findChild( (*it)->path() )) ) { delete item; } - item = new FileListViewItem(this,_parent,*it); + item = new FileListViewItem(this,_tqparent,*it); } if (item->isDir()) { m_Dirsread[item->fullName()]=false; @@ -753,10 +753,10 @@ void kdesvnfilelist::insertDirs(FileListViewItem * _parent,svn::StatusEntries&dl } /* newdir is the NEW directory! just required if local */ -void kdesvnfilelist::slotDirAdded(const QString&newdir,FileListViewItem*k) +void kdesvnfilelist::slotDirAdded(const TQString&newdir,FileListViewItem*k) { if (k) { - k->refreshStatus(); + k->refreshtqStatus(); } if (!isWorkingCopy()) { if (k) { @@ -769,7 +769,7 @@ void kdesvnfilelist::slotDirAdded(const QString&newdir,FileListViewItem*k) } return; } - QListViewItem*temp; + TQListViewItem*temp; while ((temp=firstChild())) { delete temp; } @@ -779,7 +779,7 @@ void kdesvnfilelist::slotDirAdded(const QString&newdir,FileListViewItem*k) } svn::StatusPtr stat; try { - stat = m_SvnWrapper->svnclient()->singleStatus(newdir); + stat = m_SvnWrapper->svnclient()->singletqStatus(newdir); } catch (const svn::ClientException&e) { m_LastException = e.msg(); kdDebug()<<"Catched on singlestatus"<< endl; @@ -818,20 +818,20 @@ kdesvnfilelist::~kdesvnfilelist() ssh.killSshAgent(); } -void kdesvnfilelist::slotItemRead(QListViewItem*aItem) +void kdesvnfilelist::slotItemRead(TQListViewItem*aItem) { if (!aItem) return; - CursorStack a(Qt::BusyCursor); + CursorStack a(TQt::BusyCursor); FileListViewItem* k = static_cast<FileListViewItem*>( aItem ); bool _ex = true; if (isWorkingCopy()) { - QDir d(k->fullName()); //FIXME: remove this as soon as we've been able to set entry->kind in Checkdirs + TQDir d(k->fullName()); //FIXME: remove this as soon as we've been able to set entry->kind in Checkdirs _ex = k->isDir()||d.exists(); } else { _ex = k->isDir(); } - if (_ex &&(m_Dirsread.find(k->fullName())==m_Dirsread.end()||m_Dirsread[k->fullName()]==false)) { + if (_ex &&(m_Dirsread.tqfind(k->fullName())==m_Dirsread.end()||m_Dirsread[k->fullName()]==false)) { if (checkDirs(k->fullName(),k)) { m_Dirsread[k->fullName()]=true; } else { @@ -912,7 +912,7 @@ void kdesvnfilelist::enableActions() m_DelCurrent->setEnabled( (multi||single)); m_LockAction->setEnabled( (multi||single)); m_UnlockAction->setEnabled( (multi||single)); - m_IgnoreAction->setEnabled((single)&&singleSelected()->parent()!=0&&!singleSelected()->isRealVersioned()); + m_IgnoreAction->setEnabled((single)&&singleSelected()->tqparent()!=0&&!singleSelected()->isRealVersioned()); m_RenameAction->setEnabled(single && (!isWorkingCopy()||singleSelected()!=firstChild())); m_CopyAction->setEnabled(single && (!isWorkingCopy()||singleSelected()!=firstChild())); @@ -1026,7 +1026,7 @@ void kdesvnfilelist::slotSelectionChanged() } m_SelectedItems->clear(); - QListViewItemIterator it( this, QListViewItemIterator::Selected ); + TQListViewItemIterator it( this, TQListViewItemIterator::Selected ); while ( it.current() ) { m_SelectedItems->append( static_cast<FileListViewItem*>(it.current()) ); ++it; @@ -1036,22 +1036,22 @@ void kdesvnfilelist::slotSelectionChanged() } /*! - \fn kdesvnfilelist::slotClientException(const QString&) + \fn kdesvnfilelist::slotClientException(const TQString&) */ -void kdesvnfilelist::slotClientException(const QString&what) +void kdesvnfilelist::slotClientException(const TQString&what) { emit sigLogMessage(what); - KMessageBox::sorry(KApplication::activeModalWidget(),what,i18n("SVN Error")); + KMessageBox::sorry(TQT_TQWIDGET(KApplication::activeModalWidget()),what,i18n("SVN Error")); } /*! - \fn kdesvnfilelist::slotNotifyMessage(const QString&) + \fn kdesvnfilelist::slotNotifyMessage(const TQString&) */ -void kdesvnfilelist::slotNotifyMessage(const QString&what) +void kdesvnfilelist::slotNotifyMessage(const TQString&what) { emit sigLogMessage(what); - kapp->processEvents(20); + kapp->tqprocessEvents(20); } void kdesvnfilelist::slotChangeToRepository() @@ -1067,13 +1067,13 @@ void kdesvnfilelist::slotChangeToRepository() return; } if (i.reposRoot().isEmpty()) { - KMessageBox::sorry(KApplication::activeModalWidget(),i18n("Could not retrieve repository of working copy."),i18n("SVN Error")); + KMessageBox::sorry(TQT_TQWIDGET(KApplication::activeModalWidget()),i18n("Could not retrieve repository of working copy."),i18n("SVN Error")); } else { sigSwitchUrl(i.reposRoot()); } } -void kdesvnfilelist::slotItemDoubleClicked(QListViewItem*item) +void kdesvnfilelist::slotItemDoubleClicked(TQListViewItem*item) { if (!item) return; @@ -1087,7 +1087,7 @@ void kdesvnfilelist::slotItemDoubleClicked(QListViewItem*item) return; } svn::Revision rev(isWorkingCopy()?svn::Revision::UNDEFINED:m_pList->m_remoteRevision); - QString feditor = Kdesvnsettings::external_display(); + TQString feditor = Kdesvnsettings::external_display(); if ( feditor.compare("default") == 0 ) { KURL::List lst; lst.append(fki->kdeName(rev)); @@ -1103,7 +1103,7 @@ void kdesvnfilelist::slotItemDoubleClicked(QListViewItem*item) } } else { if ( KRun::runCommand(feditor + " " + fki->kdeName(rev).prettyURL()) <= 0) { - KMessageBox::error(this,i18n("Failed: %1 %2").arg(feditor).arg(fki->fullName())); + KMessageBox::error(this,i18n("Failed: %1 %2").tqarg(feditor).tqarg(fki->fullName())); } } } @@ -1115,7 +1115,7 @@ void kdesvnfilelist::slotCleanupAction() if (!which) which = static_cast<FileListViewItem*>(firstChild()); if (!which||!which->isDir()) return; if (m_SvnWrapper->makeCleanup(which->fullName())) { - which->refreshStatus(true); + which->refreshtqStatus(true); } } @@ -1126,7 +1126,7 @@ void kdesvnfilelist::slotResolved() if (!which) which = static_cast<FileListViewItem*>(firstChild()); if (!which) return; m_SvnWrapper->slotResolved(which->fullName()); - which->refreshStatus(true); + which->refreshtqStatus(true); slotRescanIcons(false); } @@ -1140,7 +1140,7 @@ void kdesvnfilelist::slotTryResolve() m_SvnWrapper->slotResolve(which->fullName()); } -template<class T> KDialogBase* kdesvnfilelist::createDialog(T**ptr,const QString&_head,bool OkCancel,const char*name,bool showHelp) +template<class T> KDialogBase* kdesvnfilelist::createDialog(T**ptr,const TQString&_head,bool OkCancel,const char*name,bool showHelp) { int buttons = KDialogBase::Ok; if (OkCancel) { @@ -1150,14 +1150,14 @@ template<class T> KDialogBase* kdesvnfilelist::createDialog(T**ptr,const QString buttons = buttons|KDialogBase::Help; } KDialogBase * dlg = new KDialogBase( - KApplication::activeModalWidget(), + TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())), name, true, _head, buttons); if (!dlg) return dlg; - QWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget(); *ptr = new T(Dialog1Layout); dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),name?name:"standard_size")); return dlg; @@ -1177,15 +1177,15 @@ void kdesvnfilelist::slotImportIntoCurrent(bool dirs) KMessageBox::error(this,i18n("Cannot import into multiple targets!")); return; } - QString targetUri; + TQString targetUri; if (allSelected()->count()==0) { targetUri=baseUri(); } else { targetUri = allSelected()->at(0)->Url(); } KURL uri; - if (dirs) uri = KFileDialog::getExistingDirectory(QString::null,this,"Import files from folder"); - else uri = KFileDialog::getImageOpenURL(QString::null,this,"Import file"); + if (dirs) uri = KFileDialog::getExistingDirectory(TQString(),this,"Import files from folder"); + else uri = KFileDialog::getImageOpenURL(TQString(),this,"Import file"); if (uri.url().isEmpty()) return; @@ -1196,30 +1196,30 @@ void kdesvnfilelist::slotImportIntoCurrent(bool dirs) slotImportIntoDir(uri,targetUri,dirs); } -void kdesvnfilelist::slotImportIntoDir(const KURL&importUrl,const QString&target,bool dirs) +void kdesvnfilelist::slotImportIntoDir(const KURL&importUrl,const TQString&target,bool dirs) { Logmsg_impl*ptr; Importdir_logmsg*ptr2 = 0; KDialogBase*dlg; KURL uri = importUrl; - QString targetUri = target; + TQString targetUri = target; while (targetUri.endsWith("/")) { targetUri.truncate(targetUri.length()-1); } if (dirs) { - dlg = createDialog(&ptr2,QString(i18n("Import log")),true,"import_log_msg"); + dlg = createDialog(&ptr2,TQString(i18n("Import log")),true,"import_log_msg"); ptr = ptr2; ptr2->createDirboxDir("\""+uri.fileName(true)+"\""); } else { - dlg = createDialog(&ptr,QString(i18n("Import log")),true,"import_log_msg"); + dlg = createDialog(&ptr,TQString(i18n("Import log")),true,"import_log_msg"); } if (!dlg) return; ptr->initHistory(); - if (dlg->exec()!=QDialog::Accepted) { + if (dlg->exec()!=TQDialog::Accepted) { ptr->saveHistory(true); dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"import_log_msg",false); delete dlg; @@ -1227,11 +1227,11 @@ void kdesvnfilelist::slotImportIntoDir(const KURL&importUrl,const QString&target } dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"import_log_msg",false); - QString logMessage = ptr->getMessage(); + TQString logMessage = ptr->getMessage(); svn::Depth rec = ptr->getDepth(); ptr->saveHistory(false); uri.setProtocol(""); - QString iurl = uri.path(); + TQString iurl = uri.path(); while (iurl.endsWith("/")) { iurl.truncate(iurl.length()-1); } @@ -1262,7 +1262,7 @@ void kdesvnfilelist::readSupportData() void kdesvnfilelist::refreshCurrentTree() { - QTime t; + TQTime t; t.start(); FileListViewItem*item = static_cast<FileListViewItem*>(firstChild()); if (!item) return; @@ -1273,7 +1273,7 @@ void kdesvnfilelist::refreshCurrentTree() if (item->fullName()==baseUri()) { if (!refreshItem(item)) { setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); return; } else { refreshRecursive(item); @@ -1286,8 +1286,8 @@ void kdesvnfilelist::refreshCurrentTree() } kdDebug()<<"Refresh time: "<<t.elapsed()<<" ms"<<endl; setUpdatesEnabled(true); - viewport()->repaint(); - QTimer::singleShot(1,this,SLOT(readSupportData())); + viewport()->tqrepaint(); + TQTimer::singleShot(1,this,TQT_SLOT(readSupportData())); //m_pList->startScan(); } @@ -1301,14 +1301,14 @@ void kdesvnfilelist::refreshCurrent(SvnItem*cur) setUpdatesEnabled(false); refreshRecursive(cur->fItem()); setUpdatesEnabled(true); - viewport()->repaint(); + viewport()->tqrepaint(); } -bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) +bool kdesvnfilelist::refreshRecursive(FileListViewItem*_tqparent,bool down) { FileListViewItem*item; - if (_parent) { - item = static_cast<FileListViewItem*>(_parent->firstChild()); + if (_tqparent) { + item = static_cast<FileListViewItem*>(_tqparent->firstChild()); } else { item = static_cast<FileListViewItem*>(firstChild()); } @@ -1324,10 +1324,10 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) item = static_cast<FileListViewItem*>(item->nextSibling()); } - QString what = (_parent!=0?_parent->fullName():baseUri()); + TQString what = (_tqparent!=0?_tqparent->fullName():baseUri()); svn::StatusEntries dlist; - if (!m_SvnWrapper->makeStatus(what,dlist,m_pList->m_remoteRevision)) { + if (!m_SvnWrapper->maketqStatus(what,dlist,m_pList->m_remoteRevision)) { kdDebug()<<"Fehler bei makestatus fuer "<<what <<endl; return false; } @@ -1351,7 +1351,7 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) ++clistIter; if (k->fullName()==(*it)->path()) { currentSync.removeRef(k); - k->updateStatus(*it); + k->updatetqStatus(*it); if (filterOut(k)) { dispchanged=true; delete k; @@ -1363,10 +1363,10 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) if (!gotit &&!filterOut((*it)) ) { dispchanged = true; FileListViewItem * item; - if (!_parent) { + if (!_tqparent) { item = new FileListViewItem(this,*it); } else { - item = new FileListViewItem(this,_parent,*it); + item = new FileListViewItem(this,_tqparent,*it); } if (item->isDir()) { m_Dirsread[item->fullName()]=false; @@ -1392,7 +1392,7 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) // @todo just for debugging! #ifndef NDEBUG m_SelectedItems->clear(); - QListViewItemIterator qlvit( this, QListViewItemIterator::Selected ); + TQListViewItemIterator qlvit( this, TQListViewItemIterator::Selected ); while ( qlvit.current() ) { m_SelectedItems->append( static_cast<FileListViewItem*>(qlvit.current()) ); ++qlvit; @@ -1400,8 +1400,8 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) kdDebug() << "Selected items " << m_SelectedItems->count() << endl; #endif } - if (_parent) { - item = static_cast<FileListViewItem*>(_parent->firstChild()); + if (_tqparent) { + item = static_cast<FileListViewItem*>(_tqparent->firstChild()); } else { item = static_cast<FileListViewItem*>(firstChild()); } @@ -1410,7 +1410,7 @@ bool kdesvnfilelist::refreshRecursive(FileListViewItem*_parent,bool down) } while (item) { if (item->isDir()) { - if ((m_Dirsread.find(item->fullName())!=m_Dirsread.end()&&m_Dirsread[item->fullName()]==true)) { + if ((m_Dirsread.tqfind(item->fullName())!=m_Dirsread.end()&&m_Dirsread[item->fullName()]==true)) { if (item->childCount()==0) { checkDirs(item->fullName(),item); dispchanged = true; @@ -1430,7 +1430,7 @@ KTrader::OfferList kdesvnfilelist::offersList(SvnItem*item,bool execOnly) if (!item) { return offers; } - QString constraint; + TQString constraint; if (execOnly) { constraint = "Type == 'Application' or (exist Exec)"; } else { @@ -1441,14 +1441,14 @@ KTrader::OfferList kdesvnfilelist::offersList(SvnItem*item,bool execOnly) return offers; } -void kdesvnfilelist::slotContextMenuRequested(QListViewItem */* _item */, const QPoint &, int) +void kdesvnfilelist::slotContextMenuRequested(TQListViewItem */* _item */, const TQPoint &, int) { // FileListViewItem*item = static_cast<FileListViewItem*>(_item); bool isopen = baseUri().length()>0; SvnItemList l; SelectionList(&l); - QString menuname; + TQString menuname; if (!isopen) { menuname="empty"; @@ -1481,9 +1481,9 @@ void kdesvnfilelist::slotContextMenuRequested(QListViewItem */* _item */, const } } - QWidget * target; + TQWidget * target; emit sigShowPopup(menuname,&target); - QPopupMenu *popup = static_cast<QPopupMenu *>(target); + TQPopupMenu *popup = static_cast<TQPopupMenu *>(target); if (!popup) { kdDebug()<<"Error getting popupMenu"<<endl; return; @@ -1510,7 +1510,7 @@ void kdesvnfilelist::slotContextMenuRequested(QListViewItem */* _item */, const } } } - popup->exec(QCursor::pos()); + popup->exec(TQCursor::pos()); if (id>-1) { popup->removeItem(id); } @@ -1521,11 +1521,11 @@ void kdesvnfilelist::slotContextMenuRequested(QListViewItem */* _item */, const } /** -* Overridden virtuals for Qt drag 'n drop (XDND) +* Overridden virtuals for TQt drag 'n drop (XDND) */ -void kdesvnfilelist::contentsDragEnterEvent(QDragEnterEvent *event) +void kdesvnfilelist::contentsDragEnterEvent(TQDragEnterEvent *event) { - QListViewItem*item; + TQListViewItem*item; bool ok = validDropEvent(event,item); if (ok) { event->accept(); @@ -1535,14 +1535,14 @@ void kdesvnfilelist::contentsDragEnterEvent(QDragEnterEvent *event) } //void kdesvnfilelist::startDrag() -QDragObject* kdesvnfilelist::dragObject() +TQDragObject* kdesvnfilelist::dragObject() { m_pList->m_fileTip->setItem(0); - QListViewItem * m_pressedItem = currentItem(); + TQListViewItem * m_pressedItem = currentItem(); if (!m_pressedItem) { return 0; } - QPixmap pixmap2; + TQPixmap pixmap2; KURL::List urls = selectedUrls(); if (urls.count()==0) { return 0; @@ -1567,8 +1567,8 @@ QDragObject* kdesvnfilelist::dragObject() /* workaround for KURL::Drag - it always forget the revision part on drop :( */ if (!isWorkingCopy()) { - QStrList l; - QString t; + TQStrList l; + TQString t; KURL::List::ConstIterator it = urls.begin(); for (;it!=urls.end();++it) { l.append((*it).prettyURL()); @@ -1585,17 +1585,17 @@ QDragObject* kdesvnfilelist::dragObject() return drag; } -void kdesvnfilelist::contentsDragLeaveEvent( QDragLeaveEvent * ) +void kdesvnfilelist::contentsDragLeaveEvent( TQDragLeaveEvent * ) { cleanHighLighter(); } -bool kdesvnfilelist::acceptDrag(QDropEvent *event)const +bool kdesvnfilelist::acceptDrag(TQDropEvent *event)const { return KURLDrag::canDecode(event); } -bool kdesvnfilelist::validDropEvent(QDropEvent*event,QListViewItem*&item) +bool kdesvnfilelist::validDropEvent(TQDropEvent*event,TQListViewItem*&item) { if (!event) return false; if (!isWorkingCopy()) { @@ -1614,7 +1614,7 @@ bool kdesvnfilelist::validDropEvent(QDropEvent*event,QListViewItem*&item) if (baseUri().length()==0) { ok = true; } else { - QPoint vp = contentsToViewport( event->pos() ); + TQPoint vp = contentsToViewport( event->pos() ); item = isExecuteArea( vp ) ? itemAt( vp ) : 0L; FileListViewItem*which=static_cast<FileListViewItem*>(item); if (!isWorkingCopy()) { @@ -1632,9 +1632,9 @@ bool kdesvnfilelist::validDropEvent(QDropEvent*event,QListViewItem*&item) return ok; } -void kdesvnfilelist::contentsDropEvent(QDropEvent * event) +void kdesvnfilelist::contentsDropEvent(TQDropEvent * event) { - QListViewItem *item = 0; + TQListViewItem *item = 0; bool ok = validDropEvent(event,item); cleanHighLighter(); if (ok) { @@ -1644,20 +1644,20 @@ void kdesvnfilelist::contentsDropEvent(QDropEvent * event) } } -void kdesvnfilelist::contentsDragMoveEvent( QDragMoveEvent* event) +void kdesvnfilelist::contentsDragMoveEvent( TQDragMoveEvent* event) { - QListViewItem * item; + TQListViewItem * item; bool ok = validDropEvent(event,item); if (item && item!=m_pList->dragOverItem) { - QPoint vp = contentsToViewport( event->pos() ); + TQPoint vp = contentsToViewport( event->pos() ); m_pList->dragOverItem=item; m_pList->dragOverPoint = vp; - QRect tmpRect = drawItemHighlighter(0, m_pList->dragOverItem); + TQRect tmpRect = drawItemHighlighter(0, m_pList->dragOverItem); if (tmpRect!=m_pList->mOldDropHighlighter) { cleanHighLighter(); m_pList->mOldDropHighlighter=tmpRect; - viewport()->repaint(tmpRect); + viewport()->tqrepaint(tmpRect); kapp->processEvents(); } } @@ -1668,22 +1668,22 @@ void kdesvnfilelist::contentsDragMoveEvent( QDragMoveEvent* event) } } -void kdesvnfilelist::viewportPaintEvent(QPaintEvent *ev) +void kdesvnfilelist::viewportPaintEvent(TQPaintEvent *ev) { KListView::viewportPaintEvent(ev); if (m_pList->mOldDropHighlighter.isValid() && ev->rect().intersects(m_pList->mOldDropHighlighter)) { - QPainter painter(viewport()); - style().drawPrimitive(QStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, colorGroup(), - QStyle::Style_FocusAtBorder); + TQPainter painter(viewport()); + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_pList->mOldDropHighlighter, tqcolorGroup(), + TQStyle::Style_FocusAtBorder); } } void kdesvnfilelist::cleanHighLighter() { if (m_pList->mOldDropHighlighter.isValid()) { - QRect rect=m_pList->mOldDropHighlighter; - m_pList->mOldDropHighlighter=QRect(); - viewport()->repaint(rect, true); + TQRect rect=m_pList->mOldDropHighlighter; + m_pList->mOldDropHighlighter=TQRect(); + viewport()->tqrepaint(rect, true); } } @@ -1715,7 +1715,7 @@ void kdesvnfilelist::slotMergeRevisions() void kdesvnfilelist::slotMerge() { FileListViewItem*which= singleSelected(); - QString src1,src2,target; + TQString src1,src2,target; if (isWorkingCopy()) { if (m_pList->merge_Target.isEmpty()) { target = which?which->fullName():baseUri(); @@ -1735,7 +1735,7 @@ void kdesvnfilelist::slotMerge() bool force,dry,rec,irelated,useExternal; Rangeinput_impl::revision_range range; MergeDlg_impl*ptr; - KDialogBase*dlg = createDialog(&ptr,QString(i18n("Merge")),true,"merge_dialog",true); + KDialogBase*dlg = createDialog(&ptr,TQString(i18n("Merge")),true,"merge_dialog",true); if (!dlg) { return; } @@ -1743,7 +1743,7 @@ void kdesvnfilelist::slotMerge() ptr->setDest(target); ptr->setSrc1(src1); ptr->setSrc2(src1); - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { src1=ptr->Src1(); src2=ptr->Src2(); if (src2.isEmpty()) { @@ -1779,16 +1779,16 @@ void kdesvnfilelist::slotMerge() delete dlg; } -void kdesvnfilelist::slotDropped(QDropEvent* event,QListViewItem*item) +void kdesvnfilelist::slotDropped(TQDropEvent* event,TQListViewItem*item) { KURL::List urlList; - QMap<QString,QString> metaData; - QDropEvent::Action action = event->action(); + TQMap<TQString,TQString> metaData; + TQDropEvent::Action action = event->action(); if (!event || m_pList->intern_dropRunning||!KURLDrag::decode( event, urlList, metaData)||urlList.count()<1) { return; } kdDebug()<<"slotDropped"<<endl; - QString tdir; + TQString tdir; if (item) { FileListViewItem*which = static_cast<FileListViewItem*>(item); clearSelection(); @@ -1807,15 +1807,15 @@ void kdesvnfilelist::slotDropped(QDropEvent* event,QListViewItem*item) return; } if (baseUri().length()>0 /*&& urlList[0].isLocalFile()*/) { - QString path = urlList[0].path(); - QFileInfo fi(path); + TQString path = urlList[0].path(); + TQFileInfo fi(path); if (!isWorkingCopy()) { slotImportIntoDir(urlList[0],tdir,fi.isDir()); } else { //m_pList->stopScan(); KIO::Job * job = 0L; job = KIO::copy(urlList,tdir); - connect( job, SIGNAL( result( KIO::Job * ) ),SLOT( slotCopyFinished( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ),TQT_SLOT( slotCopyFinished( KIO::Job * ) ) ); dispDummy(); event->acceptAction(); return; @@ -1825,26 +1825,26 @@ void kdesvnfilelist::slotDropped(QDropEvent* event,QListViewItem*item) kdDebug()<<"Dropped from inside " << action << endl; int root_x, root_y, win_x, win_y; uint keybstate; - QDropEvent::Action action = QDropEvent::UserAction; + TQDropEvent::Action action = TQDropEvent::UserAction; KeyState::keystate(&root_x,&root_y,&win_x,&win_y,&keybstate); - if (keybstate&Qt::ControlButton) { + if (keybstate&TQt::ControlButton) { kdDebug()<<"Control pressed" << endl; - action = QDropEvent::Copy; - } else if (keybstate&Qt::ShiftButton) { + action = TQDropEvent::Copy; + } else if (keybstate&TQt::ShiftButton) { kdDebug()<<"Shift pressed" << endl; - action = QDropEvent::Move; + action = TQDropEvent::Move; } /* converting urls to interal style */ - QString nProto; + TQString nProto; if (isWorkingCopy()) { nProto=""; } else { nProto = svn::Url::transformProtokoll(urlList[0].protocol()); } KURL::List::Iterator it = urlList.begin(); - QStringList l; + TQStringList l; for (;it!=urlList.end();++it) { - l = QStringList::split("?",(*it).prettyURL()); + l = TQStringList::split("?",(*it).prettyURL()); if (l.size()>1) { (*it) = l[0]; } else if (isWorkingCopy()) @@ -1859,8 +1859,8 @@ void kdesvnfilelist::slotDropped(QDropEvent* event,QListViewItem*item) m_pList->intern_drops = urlList; m_pList->intern_drop_target=tdir; m_pList->intern_drop_action=action; - m_pList->intern_drop_pos=QCursor::pos(); - QTimer::singleShot(0,this,SLOT(slotInternalDrop())); + m_pList->intern_drop_pos=TQCursor::pos(); + TQTimer::singleShot(0,this,TQT_SLOT(slotInternalDrop())); // internalDrop(action,urlList,tdir); } @@ -1868,17 +1868,17 @@ void kdesvnfilelist::slotDropped(QDropEvent* event,QListViewItem*item) void kdesvnfilelist::slotInternalDrop() { - QDropEvent::Action action = m_pList->intern_drop_action; - if (action==QDropEvent::UserAction) { - QPopupMenu popup; + TQDropEvent::Action action = m_pList->intern_drop_action; + if (action==TQDropEvent::UserAction) { + TQPopupMenu popup; popup.insertItem(SmallIconSet("goto"), i18n( "Move Here" ) + "\t" + KKey::modFlagLabel( KKey::SHIFT ), 2 ); popup.insertItem(SmallIconSet("editcopy"), i18n( "Copy Here" ) + "\t" + KKey::modFlagLabel( KKey::CTRL ), 1 ); popup.insertSeparator(); - popup.insertItem(SmallIconSet("cancel"), i18n( "Cancel" ) + "\t" + KKey( Qt::Key_Escape ).toString(), 5); + popup.insertItem(SmallIconSet("cancel"), i18n( "Cancel" ) + "\t" + KKey( TQt::Key_Escape ).toString(), 5); int result = popup.exec(m_pList->intern_drop_pos); switch (result) { - case 1 : action = QDropEvent::Copy; break; - case 2 : action = QDropEvent::Move; break; + case 1 : action = TQDropEvent::Copy; break; + case 2 : action = TQDropEvent::Move; break; default: { m_pList->intern_dropRunning=false; @@ -1886,7 +1886,7 @@ void kdesvnfilelist::slotInternalDrop() } } } - if (action==QDropEvent::Move) { + if (action==TQDropEvent::Move) { m_SvnWrapper->makeMove(m_pList->intern_drops,m_pList->intern_drop_target,false); } else { m_SvnWrapper->makeCopy(m_pList->intern_drops,m_pList->intern_drop_target,svn::Revision::HEAD); @@ -1915,7 +1915,7 @@ void kdesvnfilelist::copy_move(bool move) bool ok, force; FileListViewItem*which = singleSelected(); if (!which) return; - QString nName = CopyMoveView_impl::getMoveCopyTo(&ok,&force,move, + TQString nName = CopyMoveView_impl::getMoveCopyTo(&ok,&force,move, which->fullName(),baseUri(),this,"move_name"); if (!ok) { return; @@ -1946,7 +1946,7 @@ void kdesvnfilelist::slotCopyFinished( KIO::Job * job) } if (job) { bool ok = true; - qApp->exit_loop(); + tqApp->exit_loop(); if (job->error()) { job->showErrorDialog(this); ok = false; @@ -1955,9 +1955,9 @@ void kdesvnfilelist::slotCopyFinished( KIO::Job * job) if (ok) { KURL::List lst = static_cast<KIO::CopyJob*>(job)->srcURLs(); KURL turl = static_cast<KIO::CopyJob*>(job)->destURL(); - QString base = turl.path(1); + TQString base = turl.path(1); KURL::List::iterator iter; - QValueList<svn::Path> tmp; + TQValueList<svn::Path> tmp; for (iter=lst.begin();iter!=lst.end();++iter) { tmp.push_back(svn::Path((base+(*iter).fileName(true)))); } @@ -1975,7 +1975,7 @@ void kdesvnfilelist::slotCopyFinished( KIO::Job * job) void kdesvnfilelist::slotDelete() { m_deletePerfect = true; - QPtrList<FileListViewItem>*lst = allSelected(); + TQPtrList<FileListViewItem>*lst = allSelected(); if (lst->count()==0) { KMessageBox::error(this,i18n("Nothing selected for delete")); @@ -1986,8 +1986,8 @@ void kdesvnfilelist::slotDelete() //m_pList->stopScan(); m_pList->m_fileTip->setItem(0); - QValueList<svn::Path> items; - QStringList displist; + TQValueList<svn::Path> items; + TQStringList displist; KURL::List kioList; while ((cur=liter.current())!=0){ ++liter; @@ -2005,7 +2005,7 @@ void kdesvnfilelist::slotDelete() } if (kioList.count()>0) { KIO::Job*aJob = KIO::del(kioList); - connect(aJob,SIGNAL(result (KIO::Job *)),this,SLOT(slotDeleteFinished(KIO::Job*))); + connect(aJob,TQT_SIGNAL(result (KIO::Job *)),this,TQT_SLOT(slotDeleteFinished(KIO::Job*))); dispDummy(); } if (m_deletePerfect && items.size()>0) { @@ -2021,7 +2021,7 @@ void kdesvnfilelist::slotDelete() void kdesvnfilelist::slotDeleteFinished(KIO::Job*job) { if (job) { - qApp->exit_loop(); + tqApp->exit_loop(); if (job->error()) { job->showErrorDialog(this); m_deletePerfect = false; @@ -2035,15 +2035,15 @@ void kdesvnfilelist::slotDeleteFinished(KIO::Job*job) void kdesvnfilelist::dispDummy() { // wait for job - QLabel dummy(this,0,WStyle_NoBorder|WShowModal); - QSize csize = size(); + TQLabel dummy(this,0,WStyle_NoBorder|WShowModal); + TQSize csize = size(); dummy.setText(i18n("Please wait until job is finished")); - dummy.resize(dummy.minimumSizeHint()); + dummy.resize(dummy.tqminimumSizeHint()); if (dummy.width()<=width()&&dummy.height()<=height()) { dummy.move(csize.width()/2-dummy.width()/2,csize.height()/2-dummy.height()/2); } dummy.show(); - qApp->enter_loop(); + tqApp->enter_loop(); dummy.hide(); } @@ -2053,7 +2053,7 @@ void kdesvnfilelist::dispDummy() */ void kdesvnfilelist::slotLock() { - QPtrList<FileListViewItem>*lst = allSelected(); + TQPtrList<FileListViewItem>*lst = allSelected(); FileListViewItemListIterator liter(*lst); FileListViewItem*cur; if (lst->count()==0) { @@ -2062,27 +2062,27 @@ void kdesvnfilelist::slotLock() } KDialogBase*dlg; Logmsg_impl*ptr; - dlg = createDialog(&ptr,QString(i18n("Lock message")),true,"locking_log_msg"); + dlg = createDialog(&ptr,TQString(i18n("Lock message")),true,"locking_log_msg"); if (!dlg) return; ptr->initHistory(); ptr->hideDepth(true); - QCheckBox*_stealLock = new QCheckBox("",ptr,"create_dir_checkbox"); + TQCheckBox*_stealLock = new TQCheckBox("",ptr,"create_dir_checkbox"); _stealLock->setText(i18n("Steal lock?")); ptr->addItemWidget(_stealLock); ptr->m_keepLocksButton->hide(); - if (dlg->exec()!=QDialog::Accepted) { + if (dlg->exec()!=TQDialog::Accepted) { ptr->saveHistory(true); delete dlg; return; } dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"locking_log_msg",false); - QString logMessage = ptr->getMessage(); + TQString logMessage = ptr->getMessage(); bool steal = _stealLock->isChecked(); ptr->saveHistory(false); - QStringList displist; + TQStringList displist; while ((cur=liter.current())!=0){ ++liter; displist.append(cur->fullName()); @@ -2097,7 +2097,7 @@ void kdesvnfilelist::slotLock() */ void kdesvnfilelist::slotUnlock() { - QPtrList<FileListViewItem>*lst = allSelected(); + TQPtrList<FileListViewItem>*lst = allSelected(); FileListViewItemListIterator liter(*lst); FileListViewItem*cur; if (lst->count()==0) { @@ -2110,7 +2110,7 @@ void kdesvnfilelist::slotUnlock() } bool breakit = res==KMessageBox::Yes; - QStringList displist; + TQStringList displist; while ((cur=liter.current())!=0){ ++liter; displist.append(cur->fullName()); @@ -2154,11 +2154,11 @@ void kdesvnfilelist::slotRangeBlame() SvnItem*k = singleSelected(); if (!k) return; Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { Rangeinput_impl::revision_range r = rdlg->getRange(); m_SvnWrapper->makeBlame(r.first,r.second,k); } @@ -2175,7 +2175,7 @@ void kdesvnfilelist::slotSimpleBaseDiff() chdir(baseUri().local8Bit()); } - QString what; + TQString what; if (!kitem) { what=="."; } else { @@ -2188,7 +2188,7 @@ void kdesvnfilelist::slotSimpleBaseDiff() void kdesvnfilelist::slotSimpleHeadDiff() { FileListViewItem*kitem = singleSelected(); - QString what; + TQString what; if (isWorkingCopy()) { chdir(baseUri().local8Bit()); @@ -2206,7 +2206,7 @@ void kdesvnfilelist::slotSimpleHeadDiff() void kdesvnfilelist::slotDisplayLastDiff() { FileListViewItem*kitem = singleSelected(); - QString what; + TQString what; if (isWorkingCopy()) { chdir(baseUri().local8Bit()); @@ -2214,7 +2214,7 @@ void kdesvnfilelist::slotDisplayLastDiff() svn::Revision end = svn::Revision::PREV; if (!kitem) { if (isWorkingCopy()) { - QListViewItem*fi = firstChild(); + TQListViewItem*fi = firstChild(); kitem = static_cast<FileListViewItem*>(fi); if (!kitem) { return; @@ -2248,7 +2248,7 @@ void kdesvnfilelist::slotDisplayLastDiff() void kdesvnfilelist::slotDiffPathes() { - QPtrList<FileListViewItem>*lst = allSelected(); + TQPtrList<FileListViewItem>*lst = allSelected(); if (lst->count()!=2 || !uniqueTypeSelected()) { return; @@ -2258,7 +2258,7 @@ void kdesvnfilelist::slotDiffPathes() FileListViewItem*k1,*k2; k1 = lst->at(0); k2 = lst->at(1); - QString w1,w2; + TQString w1,w2; svn::Revision r1; if (isWorkingCopy()) { @@ -2280,17 +2280,17 @@ void kdesvnfilelist::slotDiffPathes() void kdesvnfilelist::slotMkdir() { SvnItem*k = singleSelected(); - QString parentDir; + TQString tqparentDir; if (k) { if (!k->isDir()) { KMessageBox::sorry(0,i18n("May not make subdirs of a file")); return; } - parentDir=k->fullName(); + tqparentDir=k->fullName(); } else { - parentDir=baseUri(); + tqparentDir=baseUri(); } - QString ex = m_SvnWrapper->makeMkdir(parentDir); + TQString ex = m_SvnWrapper->makeMkdir(tqparentDir); if (!ex.isEmpty()) { slotDirAdded(ex,static_cast<FileListViewItem*>(k)); } @@ -2302,12 +2302,12 @@ void kdesvnfilelist::slotMkBaseDirs() if (!isopen) { return; } - QString parentDir=baseUri(); - QStringList targets; - targets.append(parentDir+"/trunk"); - targets.append(parentDir+"/branches"); - targets.append(parentDir+"/tags"); - QString msg = i18n("Automatic generated base layout by kdesvn"); + TQString tqparentDir=baseUri(); + TQStringList targets; + targets.append(tqparentDir+"/trunk"); + targets.append(tqparentDir+"/branches"); + targets.append(tqparentDir+"/tags"); + TQString msg = i18n("Automatic generated base tqlayout by kdesvn"); isopen = m_SvnWrapper->makeMkdir(targets,msg); if (isopen) { slotDirAdded(targets[0],0); @@ -2322,7 +2322,7 @@ void kdesvnfilelist::slotMkBaseDirs() void kdesvnfilelist::slotDiffRevisions() { SvnItem*k = singleSelected(); - QString what; + TQString what; if (isWorkingCopy()) { chdir(baseUri().local8Bit()); @@ -2334,11 +2334,11 @@ void kdesvnfilelist::slotDiffRevisions() what = relativePath(k); } Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { Rangeinput_impl::revision_range r = rdlg->getRange(); svn::Revision _peg=(isWorkingCopy()?svn::Revision::WORKING:remoteRevision()); m_SvnWrapper->makeDiff(what,r.first,r.second,_peg,k?k->isDir():true); @@ -2352,12 +2352,12 @@ void kdesvnfilelist::slotSelectBrowsingRevision() { if (isWorkingCopy()) return; Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } rdlg->setStartOnly(true); - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { Rangeinput_impl::revision_range r = rdlg->getRange(); m_pList->m_remoteRevision= r.first; if (childCount()==0) { @@ -2378,12 +2378,12 @@ void kdesvnfilelist::slotRevisionCat() SvnItem*k = singleSelected(); if (!k) return; Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } rdlg->setStartOnly(true); - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { Rangeinput_impl::revision_range r = rdlg->getRange(); m_SvnWrapper->slotMakeCat(r.first, k->fullName(),k->shortName(),r.first,0); } @@ -2401,9 +2401,9 @@ bool kdesvnfilelist::refreshItem(FileListViewItem*item) return false; } try { - item->setStat(svnclient()->singleStatus(item->fullName(),false,m_pList->m_remoteRevision)); + item->setStat(svnclient()->singletqStatus(item->fullName(),false,m_pList->m_remoteRevision)); } catch (const svn::ClientException&e) { - item->setStat(new svn::Status()); + item->setStat(new svn::tqStatus()); return false; } return true; @@ -2453,7 +2453,7 @@ void kdesvnfilelist::reinitItems(FileListViewItem*_item) */ void kdesvnfilelist::slotInfo() { - QPtrList<SvnItem> lst; + TQPtrList<SvnItem> lst; SelectionList(&lst); svn::Revision rev(isWorkingCopy()?svn::Revision::UNDEFINED:m_pList->m_remoteRevision); if (!isWorkingCopy()) { @@ -2473,9 +2473,9 @@ void kdesvnfilelist::slotInfo() /*! - \fn kdesvnfilelist::slotDirItemCreated(const QString&) + \fn kdesvnfilelist::slotDirItemCreated(const TQString&) */ -void kdesvnfilelist::slotDirItemCreated(const QString&what) +void kdesvnfilelist::slotDirItemCreated(const TQString&what) { m_pList->stopDirTimer(); m_pList->dirItems[what]='C'; @@ -2486,16 +2486,16 @@ void kdesvnfilelist::slotDirItemCreated(const QString&what) void kdesvnfilelist::updateParents(FileListViewItem*item) { - if (!item || !item->parent()) return; - FileListViewItem*it = static_cast<FileListViewItem*>(item->parent()); + if (!item || !item->tqparent()) return; + FileListViewItem*it = static_cast<FileListViewItem*>(item->tqparent()); it->update(); updateParents(it); } /*! - \fn kdesvnfilelist::slotDirItemDirty(const QString&) + \fn kdesvnfilelist::slotDirItemDirty(const TQString&) */ -void kdesvnfilelist::slotDirItemDirty(const QString&what) +void kdesvnfilelist::slotDirItemDirty(const TQString&what) { m_pList->stopDirTimer(); m_pList->dirItems[what]='M'; @@ -2514,12 +2514,12 @@ void kdesvnfilelist::slotDisplayProperties() void kdesvnfilelist::dispProperties(bool force) { - CursorStack a(Qt::BusyCursor); + CursorStack a(TQt::BusyCursor); bool cache_Only = (!force && isNetworked() && !Kdesvnsettings::properties_on_remote_items()); svn::PathPropertiesMapListPtr pm; SvnItem*k = singleSelected(); if (!k || !k->isRealVersioned()) { - emit sigProplist(svn::PathPropertiesMapListPtr(),false,QString("")); + emit sigProplist(svn::PathPropertiesMapListPtr(),false,TQString("")); return; } kdDebug()<<"Cacheonly: "<<cache_Only<<endl; @@ -2531,14 +2531,14 @@ void kdesvnfilelist::dispProperties(bool force) void kdesvnfilelist::_dirwatchTimeout() { kdDebug()<<"dirtimer"<<endl; - QMap<QString,QChar>::Iterator it; + TQMap<TQString,TQChar>::Iterator it; m_pList->m_fileTip->setItem(0); viewport()->setUpdatesEnabled(false); - bool repaintit=false; + bool tqrepaintit=false; for (it=m_pList->dirItems.begin();it!=m_pList->dirItems.end();++it) { - QString what = it.key(); - QChar c = it.data(); + TQString what = it.key(); + TQChar c = it.data(); FileListViewItem*item = findEntryItem(what); if (!item) { m_pList->m_DirWatch->removeDir(what); @@ -2554,9 +2554,9 @@ void kdesvnfilelist::_dirwatchTimeout() } if (item->isDir()) { if (item->isRealVersioned()) { - repaintit = refreshRecursive(item,false); + tqrepaintit = refreshRecursive(item,false); } else { - QListViewItem *_s; + TQListViewItem *_s; while ( (_s=item->firstChild())) { delete _s; @@ -2564,7 +2564,7 @@ void kdesvnfilelist::_dirwatchTimeout() checkUnversionedDirs(item); } } - updateParents(static_cast<FileListViewItem*>(item->parent())); + updateParents(static_cast<FileListViewItem*>(item->tqparent())); } else if (c=='D') { if (item->isDir()) { m_pList->m_DirWatch->removeDir(what); @@ -2574,11 +2574,11 @@ void kdesvnfilelist::_dirwatchTimeout() if (item->isDeleted()) { m_SvnWrapper->addModifiedCache(item->stat()); } else if (!item->isMissing()) { - QFileInfo fi(what); + TQFileInfo fi(what); if (!fi.exists()) { - FileListViewItem*p = static_cast<FileListViewItem*>(item->parent()); + FileListViewItem*p = static_cast<FileListViewItem*>(item->tqparent()); delete item; - repaintit=true; + tqrepaintit=true; item = 0; if (p && p->isVersioned()) { p->update(); @@ -2599,19 +2599,19 @@ void kdesvnfilelist::_dirwatchTimeout() } m_pList->dirItems.clear(); viewport()->setUpdatesEnabled(true); - if (repaintit) { -// viewport()->repaint(); + if (tqrepaintit) { +// viewport()->tqrepaint(); } } /*! - \fn kdesvnfilelist::slotDirItemDeleted(const QString&) + \fn kdesvnfilelist::slotDirItemDeleted(const TQString&) */ -void kdesvnfilelist::slotDirItemDeleted(const QString&what) +void kdesvnfilelist::slotDirItemDeleted(const TQString&what) { m_pList->stopDirTimer(); m_pList->m_fileTip->setItem(0); - QMap<QString,QChar>::Iterator it = m_pList->dirItems.find(what); + TQMap<TQString,TQChar>::Iterator it = m_pList->dirItems.tqfind(what); if (it!=m_pList->dirItems.end() && m_pList->dirItems[what]=='A') { m_pList->dirItems.erase(it); } else { @@ -2621,7 +2621,7 @@ void kdesvnfilelist::slotDirItemDeleted(const QString&what) } -void kdesvnfilelist::gotPreview( const KFileItem*, const QPixmap&) +void kdesvnfilelist::gotPreview( const KFileItem*, const TQPixmap&) { #if 0 FileListViewItem*which = findEntryItem(item->localPath()); @@ -2640,10 +2640,10 @@ void kdesvnfilelist::gotPreviewResult() // m_previewJob = 0; } -FileListViewItem* kdesvnfilelist::findEntryItem(const QString&what,FileListViewItem*startAt) +FileListViewItem* kdesvnfilelist::findEntryItem(const TQString&what,FileListViewItem*startAt) { if (!startAt && !what.startsWith(baseUri())) return 0; - QString _what = what; + TQString _what = what; FileListViewItem*_s,*_temp; if (!startAt) { while (_what.endsWith("/")) { @@ -2671,20 +2671,20 @@ FileListViewItem* kdesvnfilelist::findEntryItem(const QString&what,FileListViewI /*! - \fn kdesvnfilelist::contentsMouseMoveEvent( QMouseEvent *e ) + \fn kdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) */ -void kdesvnfilelist::contentsMouseMoveEvent( QMouseEvent *e ) +void kdesvnfilelist::contentsMouseMoveEvent( TQMouseEvent *e ) { if (!m_pList->mousePressed) { if (Kdesvnsettings::display_file_tips()) { - QPoint vp = contentsToViewport( e->pos() ); + TQPoint vp = contentsToViewport( e->pos() ); FileListViewItem*item = isExecuteArea( vp ) ? static_cast<FileListViewItem*>(itemAt( vp )) : 0L; if (item) { - vp.setY( itemRect( item ).y() ); - QRect rect( viewportToContents( vp ), QSize(20, item->height()) ); + vp.setY( tqitemRect( item ).y() ); + TQRect rect( viewportToContents( vp ), TQSize(20, item->height()) ); m_pList->m_fileTip->setItem( static_cast<SvnItem*>(item), rect, item->pixmap(0)); m_pList->m_fileTip->setPreview(KGlobalSettings::showFilePreview(item->fullName())/*&&isWorkingCopy()*/ &&Kdesvnsettings::display_previews_in_file_tips()); @@ -2700,7 +2700,7 @@ void kdesvnfilelist::contentsMouseMoveEvent( QMouseEvent *e ) } else { - if (( m_pList->presspos - e->pos() ).manhattanLength() > QApplication::startDragDistance()) + if (( m_pList->presspos - e->pos() ).manhattanLength() > TQApplication::startDragDistance()) { m_pList->m_fileTip->setItem(0); m_pList->mousePressed=false; @@ -2710,12 +2710,12 @@ void kdesvnfilelist::contentsMouseMoveEvent( QMouseEvent *e ) KListView::contentsMouseMoveEvent( e ); } -void kdesvnfilelist::contentsMousePressEvent(QMouseEvent*e) +void kdesvnfilelist::contentsMousePressEvent(TQMouseEvent*e) { KListView::contentsMousePressEvent(e); m_pList->m_fileTip->setItem(0); - QPoint p(contentsToViewport( e->pos())); - QListViewItem *i = itemAt( p ); + TQPoint p(contentsToViewport( e->pos())); + TQListViewItem *i = itemAt( p ); // this is from qt the example - hopefully I got my problems with drag&drop fixed. if ( i ) { // if the user clicked into the root decoration of the item, don't try to start a drag! @@ -2729,23 +2729,23 @@ void kdesvnfilelist::contentsMousePressEvent(QMouseEvent*e) } } -void kdesvnfilelist::contentsMouseReleaseEvent(QMouseEvent*e) +void kdesvnfilelist::contentsMouseReleaseEvent(TQMouseEvent*e) { KListView::contentsMouseReleaseEvent(e); m_pList->mousePressed = false; } /*! - \fn kdesvnfilelist::contentsWheelEvent( QWheelEvent * e ) + \fn kdesvnfilelist::contentsWheelEvent( TQWheelEvent * e ) */ -void kdesvnfilelist::contentsWheelEvent( QWheelEvent * e ) +void kdesvnfilelist::contentsWheelEvent( TQWheelEvent * e ) { // when scrolling with mousewheel, stop possible pending filetip m_pList->m_fileTip->setItem(0); KListView::contentsWheelEvent( e ); } -void kdesvnfilelist::leaveEvent(QEvent*e) +void kdesvnfilelist::leaveEvent(TQEvent*e) { m_pList->m_fileTip->setItem( 0 ); KListView::leaveEvent( e ); @@ -2754,11 +2754,11 @@ void kdesvnfilelist::leaveEvent(QEvent*e) void kdesvnfilelist::slotSettingsChanged() { m_pList->m_fileTip->setOptions(!isNetworked()&&Kdesvnsettings::display_file_tips()&& - QToolTip::isGloballyEnabled(),true,6); + TQToolTip::isGloballyEnabled(),true,6); if (m_pList->reReadSettings()) { refreshCurrentTree(); } else { - viewport()->repaint(); + viewport()->tqrepaint(); } enableActions(); sort(); @@ -2779,11 +2779,11 @@ void kdesvnfilelist::slotRelocate() KMessageBox::error(0,i18n("Error getting entry to relocate")); return; } - QString path,fromUrl; + TQString path,fromUrl; path = k->fullName(); fromUrl = k->Url(); CheckoutInfo_impl*ptr; - KDialogBase * dlg = createDialog(&ptr,i18n("Relocate path %1").arg(path),true,"relocate_dlg"); + KDialogBase * dlg = createDialog(&ptr,i18n("Relocate path %1").tqarg(path),true,"relocate_dlg"); if (dlg) { ptr->setStartUrl(fromUrl); ptr->disableAppend(true); @@ -2794,7 +2794,7 @@ void kdesvnfilelist::slotRelocate() ptr->hideDepth(true,true); bool done = false; dlg->resize(dlg->configDialogSize(*(Kdesvnsettings::self()->config()),"relocate_dlg")); - if (dlg->exec()==QDialog::Accepted) { + if (dlg->exec()==TQDialog::Accepted) { done = m_SvnWrapper->makeRelocate(fromUrl,ptr->reposURL(),path,ptr->overwrite()); } dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"relocate_dlg",false); @@ -2804,22 +2804,22 @@ void kdesvnfilelist::slotRelocate() refreshItem(k->fItem()); } -void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) +void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _tqparent ) { - QDir d; - if (_parent) - d.setPath(_parent->fullName()); //FIXME: this one is not reliable, what if _parent == 0?? + TQDir d; + if (_tqparent) + d.setPath(_tqparent->fullName()); //FIXME: this one is not reliable, what if _tqparent == 0?? // else // d.setPath(this->firstChild()->fullName()); - d.setFilter( QDir::Files | QDir::Dirs ); + d.setFilter( TQDir::Files | TQDir::Dirs ); - const QFileInfoList *list = d.entryInfoList(); + const TQFileInfoList *list = d.entryInfoList(); if (!list) { return; } - QFileInfoListIterator nonversioned_it( *list ); - QFileInfo *fi; + TQFileInfoListIterator nonversioned_it( *list ); + TQFileInfo *fi; svn::StatusEntries nonversioned_list; @@ -2839,18 +2839,18 @@ void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) // else // entry.kind = svn_node_file; // -// svn::Status stat(fi->fileName(), &wc_stat); +// svn::tqStatus stat(fi->fileName(), &wc_stat); - svn::StatusPtr stat(new svn::Status(fi->absFilePath())); + svn::StatusPtr stat(new svn::tqStatus(fi->absFilePath())); // start copying insertDirs FileListViewItem * item; - if (!_parent) { + if (!_tqparent) { item = new FileListViewItem(this, stat); kdDebug()<< "creating new FileListViewitem " + item->fullName() << endl; } else { - item = new FileListViewItem(this,_parent, stat); - kdDebug()<< "creating new FileListViewitem (with parent) " + item->fullName() << endl; + item = new FileListViewItem(this,_tqparent, stat); + kdDebug()<< "creating new FileListViewitem (with tqparent) " + item->fullName() << endl; } if (fi->isDir()) { m_Dirsread[item->fullName()]=false; @@ -2866,13 +2866,13 @@ void kdesvnfilelist::checkUnversionedDirs( FileListViewItem * _parent ) // end of copying insertDirs nonversioned_list.append(stat); - kdDebug() << "creating new FileListViewItem from QDir entry: " << fi->fileName() << endl; + kdDebug() << "creating new FileListViewItem from TQDir entry: " << fi->fileName() << endl; } ++nonversioned_it; } // uncomment this if you've ben able to set svn_node_kind (see above) - //this->insertDirs(_parent, nonversioned_list); + //this->insertDirs(_tqparent, nonversioned_list); } void kdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,bool no_update) @@ -2886,13 +2886,13 @@ void kdesvnfilelist::rescanIconsRec(FileListViewItem*startAt,bool checkNewer,boo if (!_s) { return; } - svn::SharedPointer<svn::Status> d; + svn::SharedPointer<svn::tqStatus> d; while (_s) { //_s->makePixmap(); if (!no_update) { if (m_SvnWrapper->getUpdated(_s->stat()->path(),d) && d) { - _s->updateStatus(d); + _s->updatetqStatus(d); } else { _s->update(); } @@ -2939,7 +2939,7 @@ void kdesvnfilelist::slotCheckNewItems() */ void kdesvnfilelist::slotMakeRangeLog() { - QString what; + TQString what; SvnItem*k = SelectedOrMain(); if (k) { what = k->fullName(); @@ -2949,13 +2949,13 @@ void kdesvnfilelist::slotMakeRangeLog() return; } Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } bool list = Kdesvnsettings::self()->log_always_list_changed_files(); int i = dlg->exec(); - if (i==QDialog::Accepted) { + if (i==TQDialog::Accepted) { Rangeinput_impl::revision_range r = rdlg->getRange(); m_SvnWrapper->makeLog(r.first,r.second,(isWorkingCopy()?svn::Revision::UNDEFINED:m_pList->m_remoteRevision), what,list,0); } @@ -2965,7 +2965,7 @@ void kdesvnfilelist::slotMakeRangeLog() void kdesvnfilelist::slotMakeTree() { - QString what; + TQString what; SvnItem*k = SelectedOrMain(); if (k) { what = k->fullName(); @@ -2981,7 +2981,7 @@ void kdesvnfilelist::slotMakeTree() void kdesvnfilelist::slotMakePartTree() { - QString what; + TQString what; SvnItem*k = SelectedOrMain(); if (k) { what = k->fullName(); @@ -2991,18 +2991,18 @@ void kdesvnfilelist::slotMakePartTree() return; } Rangeinput_impl*rdlg; - KDialogBase*dlg = createDialog(&rdlg,QString(i18n("Revisions")),true,"revisions_dlg"); + KDialogBase*dlg = createDialog(&rdlg,TQString(i18n("Revisions")),true,"revisions_dlg"); if (!dlg) { return; } int i = dlg->exec(); Rangeinput_impl::revision_range r; - if (i==QDialog::Accepted) { + if (i==TQDialog::Accepted) { r = rdlg->getRange(); } dlg->saveDialogSize(*(Kdesvnsettings::self()->config()),"revisions_dlg",false); - if (i==QDialog::Accepted) { + if (i==TQDialog::Accepted) { svn::Revision rev(isWorkingCopy()?svn::Revision::UNDEFINED:m_pList->m_remoteRevision); m_SvnWrapper->makeTree(what,rev,r.first,r.second); } @@ -3013,7 +3013,7 @@ void kdesvnfilelist::slotMakePartTree() */ void kdesvnfilelist::slotMakeLog() { - QString what; + TQString what; SvnItem*k = SelectedOrMain(); if (k) { what = k->fullName(); @@ -3059,16 +3059,16 @@ void kdesvnfilelist::slotUnfoldTree() { StopSimpleDlg sdlg(0,0,i18n("Unfold tree"),i18n("Unfold all folder")); - connect(this,SIGNAL(sigListError()), - &sdlg,SLOT(makeCancel())); + connect(this,TQT_SIGNAL(sigListError()), + &sdlg,TQT_SLOT(makeCancel())); - QListViewItemIterator it(this); - QTime t;t.start(); + TQListViewItemIterator it(this); + TQTime t;t.start(); setUpdatesEnabled(false); { WidgetBlockStack a(this); - while (QListViewItem* item = it.current()) + while (TQListViewItem* item = it.current()) { if (item->isExpandable()) { if (sdlg.isCanceld()) { @@ -3077,7 +3077,7 @@ void kdesvnfilelist::slotUnfoldTree() } if (t.elapsed()>=200) { sdlg.slotTick(); - kapp->processEvents(20); + kapp->tqprocessEvents(20); t.restart(); } ((FileListViewItem*)item)->setOpenNoBlock(true); @@ -3087,18 +3087,18 @@ void kdesvnfilelist::slotUnfoldTree() } setFocus(); setUpdatesEnabled(true); - viewport()->repaint(); - repaint(); + viewport()->tqrepaint(); + tqrepaint(); m_SvnWrapper->slotCancel(false); } void kdesvnfilelist::slotFoldTree() { - QListViewItemIterator it(this); - while (QListViewItem* item = it.current()) + TQListViewItemIterator it(this); + while (TQListViewItem* item = it.current()) { // don't close the top level directory - if (item->isExpandable() && item->parent()) + if (item->isExpandable() && item->tqparent()) item->setOpen(false); ++it; @@ -3126,13 +3126,13 @@ bool kdesvnfilelist::uniqueTypeSelected() return true; } -void kdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const QValueList<QString>&dellist,const QString&path) +void kdesvnfilelist::slotChangeProperties(const svn::PropertiesMap&pm,const TQValueList<TQString>&dellist,const TQString&path) { m_SvnWrapper->changeProperties(pm,dellist,path); FileListViewItem* which = singleSelected(); kdDebug()<<(which?which->fullName():"nix") << " -> " << path<<endl; if (which && which->fullName()==path) { - which->refreshStatus(); + which->refreshtqStatus(); refreshCurrent(which); _propListTimeout(); } |