TDE
/
tdesvn
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdesvn
0
0
Fork 0
Code Issues Releases Wiki Activity

Replaced various '#define' with actual strings - part 6

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/20/head
Michele Calgaro 5 months ago
parent 29df04779b
commit 70a9b1f3fb
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
12 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File

2
src/ksvnwidgets/diffbrowser.cpp
Unescape View File

@ -95,7 +95,7 @@ void DiffBrowser::saveDiff()
}
TQFile tfile(saveTo);
if (tfile.exists()) {
if (KMessageBox::warningYesNo(TQT_TQWIDGET(TDEApplication::activeModalWidget()),
if (KMessageBox::warningYesNo(TDEApplication::activeModalWidget(),
i18n("File %1 exists - overwrite?").arg(saveTo))
!=KMessageBox::Yes) {
return;

4
src/svnfrontend/blamedisplay_impl.cpp
Unescape View File

@ -410,7 +410,7 @@ void BlameDisplay_impl::showCommit(BlameDisplayItem*bit)
}
}
KDialogBase* dlg = new KDialogBase(
TQT_TQWIDGET(TDEApplication::activeModalWidget()),
TDEApplication::activeModalWidget(),
"simplelog",true,TQString(i18n("Logmessage for revision %1").arg(bit->rev())),
KDialogBase::Close);
TQWidget* Dialog1Layout = dlg->makeVBoxMainWidget();
@ -446,7 +446,7 @@ void BlameDisplay_impl::displayBlame(SimpleLogCb*_cb,const TQString&item,const s
{
int buttons = KDialogBase::Close|KDialogBase::User1|KDialogBase::User2;
KDialogBase * dlg = new KDialogBase(
TQT_TQWIDGET(TDEApplication::activeModalWidget()),
TDEApplication::activeModalWidget(),
name,true,TQString(i18n("Blame %1")).arg(item),buttons,KDialogBase::Close,false,
KGuiItem(i18n("Goto line")),KGuiItem(i18n("Log message for revision"),"tdesvnlog"));

2
src/svnfrontend/commandexec.cpp
Unescape View File

@ -314,7 +314,7 @@ int CommandExec::exec()
if (Kdesvnsettings::self()->cmdline_show_logwindow() &&
m_lastMessagesLines >= Kdesvnsettings::self()->cmdline_log_minline()) {
KDialogBase dlg (
TQT_TQWIDGET(TDEApplication::activeModalWidget()),
TDEApplication::activeModalWidget(),
"execution_log",
true,
i18n("Execution log"),

2
src/svnfrontend/fronthelpers/revisionbuttonimpl.cpp
Unescape View File

@ -50,7 +50,7 @@ void RevisionButtonImpl::askRevision()
Rangeinput_impl*rdlg;
int buttons = KDialogBase::Ok|KDialogBase::Cancel;
KDialogBase * dlg = new KDialogBase(TQT_TQWIDGET(TDEApplication::activeModalWidget()),"Revinput",true,i18n("Select revision"),buttons);
KDialogBase * dlg = new KDialogBase(TDEApplication::activeModalWidget(),"Revinput",true,i18n("Select revision"),buttons);
if (!dlg) {
return;

8
src/svnfrontend/graphtree/revgraphview.cpp
Unescape View File

@ -901,7 +901,7 @@ void RevGraphView::makeCat(GraphTreeLabel*_l)
}
svn::Revision tr(it.data().rev);
TQString tp = _basePath+it.data().name;
emit makeCat(tr,tp,it.data().name,tr,TQT_TQWIDGET(kapp->activeModalWidget()));
emit makeCat(tr,tp,it.data().name,tr,kapp->activeModalWidget());
}
void RevGraphView::makeDiffPrev(GraphTreeLabel*_l)
@ -931,9 +931,9 @@ void RevGraphView::makeDiff(const TQString&n1,const TQString&n2)
svn::Revision tr(it.data().rev);
TQString tp = _basePath+it.data().name;
if (Kdesvnsettings::tree_diff_rec()) {
emit makeRecDiff(sp,sr,tp,tr,TQT_TQWIDGET(kapp->activeModalWidget()));
emit makeRecDiff(sp,sr,tp,tr,kapp->activeModalWidget());
} else {
emit makeNorecDiff(sp,sr,tp,tr,TQT_TQWIDGET(kapp->activeModalWidget()));
emit makeNorecDiff(sp,sr,tp,tr,kapp->activeModalWidget());
}
}
@ -944,7 +944,7 @@ void RevGraphView::setBasePath(const TQString&_path)
void RevGraphView::slotClientException(const TQString&what)
{
KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),what,i18n("SVN Error"));
KMessageBox::sorry(TDEApplication::activeModalWidget(),what,i18n("SVN Error"));
}
#include "revgraphview.moc"

4
src/svnfrontend/opencontextmenu.cpp
Unescape View File

@ -47,7 +47,7 @@ void OpenContextmenu::setup()
TQString actionName( (*it)->name().replace("&", "&&") );
act = new TDEAction( actionName, (*it)->pixmap( TDEIcon::Small ), 0,
TQT_TQOBJECT(this), TQT_SLOT( slotRunService() ), TQT_TQOBJECT(this), nam.prepend( "appservice_" ) );
this, TQT_SLOT( slotRunService() ), this, nam.prepend( "appservice_" ) );
act->plug(this);
m_mapPopup[ id++ ] = *it;
}
@ -55,7 +55,7 @@ void OpenContextmenu::setup()
insertSeparator( );
}
act = new TDEAction(i18n("Other..."),0, 0,
TQT_TQOBJECT(this), TQT_SLOT( slotOpenWith() ),TQT_TQOBJECT(this),"openwith");
this, TQT_SLOT( slotOpenWith() ),this,"openwith");
act->plug(this);
}

2
src/svnfrontend/stopdlg.cpp
Unescape View File

@ -102,7 +102,7 @@ StopDlg::~StopDlg()
void StopDlg::slotAutoShow()
{
bool hasDialogs = false;
TQWidget * w = TQT_TQWIDGET(kapp->activeModalWidget());
TQWidget * w = kapp->activeModalWidget();
if (w && w!=this && w!=parentWidget() ) {
hasDialogs = true;
}

6
src/svnfrontend/svnactions.cpp
Unescape View File

@ -252,7 +252,7 @@ template<class T> KDialogBase* SvnActions::createDialog(T**ptr,const TQString&_h
buttons = buttons|KDialogBase::User1;
}
KDialogBase * dlg = new KDialogBase(
modal?TQT_TQWIDGET(TQT_TQWIDGET(TDEApplication::activeModalWidget())):0, // parent
modal?TDEApplication::activeModalWidget():0, // parent
name, // name
modal, // modal
_head, // caption
@ -483,7 +483,7 @@ void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const
kdDebug()<<"getting logs..."<<endl;
svn::SharedPointer<svn::LogEntriesMap> logs = getLog(start,end,peg,which,list_files,limit);
if (!logs) return;
bool need_modal = m_Data->runblocked||TQT_TQWIDGET(TDEApplication::activeModalWidget())!=0;
bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget()!=0;
if (need_modal||!m_Data->m_LogDialog) {
m_Data->m_LogDialog=new SvnLogDlgImp(this,0,"logdialog",need_modal);
connect(m_Data->m_LogDialog,TQT_SIGNAL(makeDiff(const TQString&,const svn::Revision&,const TQString&,const svn::Revision&,TQWidget*)),
@ -1356,7 +1356,7 @@ void SvnActions::dispDiff(const TQByteArray&ex)
}
delete proc;
}
bool need_modal = m_Data->runblocked||TQT_TQWIDGET(TDEApplication::activeModalWidget())!=0;
bool need_modal = m_Data->runblocked||TDEApplication::activeModalWidget()!=0;
if (need_modal||!m_Data->m_DiffBrowserPtr||!m_Data->m_DiffDialog) {
DiffBrowser*ptr;

8
src/svnfrontend/svnlogdlgimp.cpp
Unescape View File

@ -580,7 +580,7 @@ void SvnLogDlgImp::slotBlameItem()
return;
}
svn::Revision start(svn::Revision::START);
m_Actions->makeBlame(start,k->rev(),_base+k->realName(),TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this);
m_Actions->makeBlame(start,k->rev(),_base+k->realName(),kapp->activeModalWidget(),k->rev(),this);
}
void SvnLogDlgImp::slotEntriesSelectionChanged()
@ -618,7 +618,7 @@ void SvnLogDlgImp::slotSingleContext(TQListViewItem*_item, const TQPoint & e, in
{
case 101:
{
m_Actions->makeBlame(start,k->rev(),_base+name,TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this);
m_Actions->makeBlame(start,k->rev(),_base+name,kapp->activeModalWidget(),k->rev(),this);
break;
}
case 102:
@ -628,7 +628,7 @@ void SvnLogDlgImp::slotSingleContext(TQListViewItem*_item, const TQPoint & e, in
}
case 103:
{
emit makeCat(k->rev(),_base+source,source,k->rev(),TQT_TQWIDGET(kapp->activeModalWidget()));
emit makeCat(k->rev(),_base+source,source,k->rev(),kapp->activeModalWidget());
}
default:
break;
@ -654,7 +654,7 @@ void SvnLogDlgImp::slotSingleDoubleClicked(TQListViewItem*_item)
//svn_revnum_t prev = item->revision()>0?item->revision():k->rev()-1;
svn::Revision start(svn::Revision::START);
if (action != "D") {
m_Actions->makeBlame(start,k->rev(),_base+name,TQT_TQWIDGET(kapp->activeModalWidget()),k->rev(),this);
m_Actions->makeBlame(start,k->rev(),_base+name,kapp->activeModalWidget(),k->rev(),this);
}
}

86
src/svnfrontend/tdesvnfilelist.cpp
Unescape View File

@ -238,8 +238,8 @@ tdesvnfilelist::tdesvnfilelist(TDEActionCollection*aCollect,TQWidget *parent, co
connect(m_SvnWrapper,TQT_SIGNAL(sigCacheStatus(TQ_LONG,TQ_LONG)),this,TQT_SIGNAL(sigCacheStatus(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));
m_pList->connectDirTimer(this);
m_pList->connectPropTimer(this);
setDropHighlighter(true);
setDragEnabled(true);
@ -260,70 +260,70 @@ void tdesvnfilelist::setupActions()
/* local and remote actions */
/* 1. actions on dirs AND files */
//new TDEAction(i18n("Log..."),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_L),this,TQT_SLOT(slotMakeRangeLog()),m_filesAction,"make_svn_log");
new TDEAction(i18n("Full Log"),"tdesvnlog",TDEShortcut(CTRL+Key_L),TQT_TQOBJECT(this),TQT_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full");
new TDEAction(i18n("Full revision tree"),"tdesvnlog",TDEShortcut(CTRL+Key_T),TQT_TQOBJECT(this),TQT_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree");
new TDEAction(i18n("Full Log"),"tdesvnlog",TDEShortcut(CTRL+Key_L),this,TQT_SLOT(slotMakeLog()),m_filesAction,"make_svn_log_full");
new TDEAction(i18n("Full revision tree"),"tdesvnlog",TDEShortcut(CTRL+Key_T),this,TQT_SLOT(slotMakeTree()),m_filesAction,"make_svn_tree");
new TDEAction(i18n("Partial revision tree"),"tdesvnlog",TDEShortcut(SHIFT+CTRL+Key_T),
TQT_TQOBJECT(this),TQT_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree");
this,TQT_SLOT(slotMakePartTree()),m_filesAction,"make_svn_partialtree");
new TDEAction(i18n("Properties"),"edit",
TDEShortcut(CTRL+Key_P),m_SvnWrapper,TQT_SLOT(slotProperties()),m_filesAction,"make_svn_property");
new TDEAction(i18n("Display Properties"),"edit",
TDEShortcut(SHIFT+CTRL+Key_P),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property");
TDEShortcut(SHIFT+CTRL+Key_P),this,TQT_SLOT(slotDisplayProperties()),m_filesAction,"get_svn_property");
tmp_action = new TDEAction(i18n("Display last changes"),"tdesvndiff",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change");
TDEShortcut(),this,TQT_SLOT(slotDisplayLastDiff()),m_filesAction,"make_last_change");
tmp_action->setToolTip(i18n("Display last changes as difference to previous commit."));
m_InfoAction = new TDEAction(i18n("Details"),"tdesvninfo",
TDEShortcut(CTRL+Key_I),TQT_TQOBJECT(this),TQT_SLOT(slotInfo()),m_filesAction,"make_svn_info");
TDEShortcut(CTRL+Key_I),this,TQT_SLOT(slotInfo()),m_filesAction,"make_svn_info");
m_RenameAction = new TDEAction(i18n("Move"),"move",
TDEShortcut(Key_F2),TQT_TQOBJECT(this),TQT_SLOT(slotRename()),m_filesAction,"make_svn_rename");
TDEShortcut(Key_F2),this,TQT_SLOT(slotRename()),m_filesAction,"make_svn_rename");
m_CopyAction = new TDEAction(i18n("Copy"),"tdesvncopy",
TDEShortcut(CTRL+Key_C),TQT_TQOBJECT(this),TQT_SLOT(slotCopy()),m_filesAction,"make_svn_copy");
tmp_action = new TDEAction(i18n("Check for updates"),"tdesvncheckupdates",TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCheckUpdates()),m_filesAction,"make_check_updates");
TDEShortcut(CTRL+Key_C),this,TQT_SLOT(slotCopy()),m_filesAction,"make_svn_copy");
tmp_action = new TDEAction(i18n("Check for updates"),"tdesvncheckupdates",TDEShortcut(),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 TDEAction(i18n("Blame"),"tdesvnblame",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotBlame()),m_filesAction,"make_svn_blame");
TDEShortcut(),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 TDEAction(i18n("Blame range"),"tdesvnblame",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRangeBlame()),m_filesAction,"make_svn_range_blame");
TDEShortcut(),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 TDEAction(i18n("Cat head"), "tdesvncat",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCat()),m_filesAction,"make_svn_cat");
TDEShortcut(),this,TQT_SLOT(slotCat()),m_filesAction,"make_svn_cat");
m_CatAction->setToolTip(i18n("Output the content of specified files or URLs."));
tmp_action = new TDEAction(i18n("Cat revision..."),"tdesvncat",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotRevisionCat()),m_filesAction,"make_revisions_cat");
TDEShortcut(),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 TDEAction(i18n("Lock current items"),"tdesvnlock",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotLock()),m_filesAction,"make_svn_lock");
TDEShortcut(),this,TQT_SLOT(slotLock()),m_filesAction,"make_svn_lock");
m_UnlockAction = new TDEAction(i18n("Unlock current items"),"tdesvnunlock",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock");
TDEShortcut(),this,TQT_SLOT(slotUnlock()),m_filesAction,"make_svn_unlock");
/* 3. actions only on dirs */
m_MkdirAction = new TDEAction(i18n("New folder"),"folder-new",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir");
TDEShortcut(),this,TQT_SLOT(slotMkdir()),m_filesAction,"make_svn_mkdir");
m_switchRepository = new TDEAction(i18n("Switch repository"),"tdesvnswitch",
TDEShortcut(), m_SvnWrapper,TQT_SLOT(slotSwitch()),m_filesAction,"make_svn_switch");
m_switchRepository->setToolTip(i18n("Switch repository path of current working copy path (\"svn switch\")"));
tmp_action = new TDEAction(i18n("Relocate current working copy url"),"tdesvnrelocate",TDEShortcut(),
TQT_TQOBJECT(this),TQT_SLOT(slotRelocate()),m_filesAction,"make_svn_relocate");
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 TDEAction(i18n("Check for unversioned items"),"tdesvnaddrecursive",TDEShortcut(),
TQT_TQOBJECT(this),TQT_SLOT(slotCheckNewItems()),m_filesAction,"make_check_unversioned");
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 TDEAction(i18n("Open repository of working copy"),"go-home",TDEShortcut(),
TQT_TQOBJECT(this),TQT_SLOT(slotChangeToRepository()),m_filesAction,"make_switch_to_repo");
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 TDEAction(i18n("Cleanup"),"tdesvncleanup",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotCleanupAction()),m_filesAction,"make_cleanup");
TDEShortcut(),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 TDEAction(i18n("Import folders into current"),"fileimport",TDEShortcut(),
TQT_TQOBJECT(this),TQT_SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current");
this,TQT_SLOT(slotImportDirsIntoCurrent()),m_filesAction,"make_import_dirs_into_current");
m_ImportDirsIntoCurrent->setToolTip(i18n("Import folder content into current url"));
/* local only actions */
@ -336,19 +336,19 @@ void tdesvnfilelist::setupActions()
tmp_action->setToolTip(i18n("Adding selected files and/or directories to repository and all subitems of folders"));
m_DelCurrent = new TDEAction(i18n("Delete selected files/dirs"),"tdesvndelete",
TDEShortcut(Key_Delete),TQT_TQOBJECT(this),TQT_SLOT(slotDelete()),m_filesAction,"make_svn_remove");
TDEShortcut(Key_Delete),this,TQT_SLOT(slotDelete()),m_filesAction,"make_svn_remove");
m_DelCurrent->setToolTip(i18n("Deleting selected files and/or directories from repository"));
m_RevertAction = new TDEAction(i18n("Revert current changes"),"document-revert",
TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotRevert()),m_filesAction,"make_svn_revert");
m_ResolvedAction = new TDEAction(i18n("Mark resolved"),TDEShortcut(),
TQT_TQOBJECT(this),TQT_SLOT(slotResolved()),m_filesAction,"make_resolved");
this,TQT_SLOT(slotResolved()),m_filesAction,"make_resolved");
m_ResolvedAction->setToolTip(i18n("Marking files or dirs resolved"));
tmp_action = new TDEAction(i18n("Resolve conflicts"),TDEShortcut(),
TQT_TQOBJECT(this),TQT_SLOT(slotTryResolve()),m_filesAction,"make_try_resolve");
this,TQT_SLOT(slotTryResolve()),m_filesAction,"make_try_resolve");
m_IgnoreAction = new TDEAction(i18n("Ignore/Unignore current item"),TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore");
m_IgnoreAction = new TDEAction(i18n("Ignore/Unignore current item"),TDEShortcut(),this,TQT_SLOT(slotIgnore()),m_filesAction,"make_svn_ignore");
m_UpdateHead = new TDEAction(i18n("Update to head"),"tdesvnupdate",
TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotUpdateHeadRec()),m_filesAction,"make_svn_headupdate");
@ -358,51 +358,51 @@ void tdesvnfilelist::setupActions()
TDEShortcut("CTRL+#"),m_SvnWrapper,TQT_SLOT(slotCommit()),m_filesAction,"make_svn_commit");
tmp_action = new TDEAction(i18n("Diff local changes"),"tdesvndiff",
TDEShortcut(CTRL+Key_D),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleBaseDiff()),m_filesAction,"make_svn_basediff");
TDEShortcut(CTRL+Key_D),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 TDEAction(i18n("Diff against HEAD"),"tdesvndiff",
TDEShortcut(CTRL+Key_H),TQT_TQOBJECT(this),TQT_SLOT(slotSimpleHeadDiff()),m_filesAction,"make_svn_headdiff");
TDEShortcut(CTRL+Key_H),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 TDEAction(i18n("Diff items"),"tdesvndiff",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff");
TDEShortcut(),this,TQT_SLOT(slotDiffPathes()),m_filesAction,"make_svn_itemsdiff");
tmp_action->setToolTip(i18n("Diff two items"));
m_MergeRevisionAction = new TDEAction(i18n("Merge two revisions"),"tdesvnmerge",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMergeRevisions()),m_filesAction,"make_svn_merge_revisions");
TDEShortcut(),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 TDEAction(i18n("Merge..."),"tdesvnmerge",
TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotMerge()),m_filesAction,"make_svn_merge");
TDEShortcut(),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 TDEAction( i18n( "Open With..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotOpenWith() ), m_filesAction, "openwith" );
tmp_action=new TDEAction( i18n( "Open With..." ), 0, this, TQT_SLOT( slotOpenWith() ), m_filesAction, "openwith" );
/* remote actions only */
m_CheckoutCurrentAction = new TDEAction(i18n("Checkout current repository path"),"tdesvncheckout",TDEShortcut(),
m_SvnWrapper,TQT_SLOT(slotCheckoutCurrent()),m_filesAction,"make_svn_checkout_current");
m_ExportCurrentAction = new TDEAction(i18n("Export current repository path"),"tdesvnexport",TDEShortcut(),
m_SvnWrapper,TQT_SLOT(slotExportCurrent()),m_filesAction,"make_svn_export_current");
new TDEAction(i18n("Select browse revision"),TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision");
new TDEAction(i18n("Select browse revision"),TDEShortcut(),this,TQT_SLOT(slotSelectBrowsingRevision()),m_filesAction,"switch_browse_revision");
/* independe actions */
m_CheckoutAction = new TDEAction(i18n("Checkout a repository"),"tdesvncheckout",
TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotCheckout()),m_filesAction,"make_svn_checkout");
m_ExportAction = new TDEAction(i18n("Export a repository"),"tdesvnexport",
TDEShortcut(),m_SvnWrapper,TQT_SLOT(slotExport()),m_filesAction,"make_svn_export");
m_RefreshViewAction = new TDEAction(i18n("Refresh view"),"reload",TDEShortcut(Key_F5),TQT_TQOBJECT(this),TQT_SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh");
m_RefreshViewAction = new TDEAction(i18n("Refresh view"),"reload",TDEShortcut(Key_F5),this,TQT_SLOT(refreshCurrentTree()),m_filesAction,"make_view_refresh");
new TDEAction(i18n("Diff revisions"),"tdesvndiff",TDEShortcut(),TQT_TQOBJECT(this),TQT_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff");
new TDEAction(i18n("Diff revisions"),"tdesvndiff",TDEShortcut(),this,TQT_SLOT(slotDiffRevisions()),m_filesAction,"make_revisions_diff");
/* folding options */
tmp_action = new TDEAction( i18n("Unfold File Tree"), 0, TQT_TQOBJECT(this) , TQT_SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" );
tmp_action = new TDEAction( i18n("Unfold File Tree"), 0, this , TQT_SLOT(slotUnfoldTree()), m_filesAction, "view_unfold_tree" );
tmp_action->setToolTip(i18n("Opens all branches of the file tree"));
tmp_action = new TDEAction( i18n("Fold File Tree"), 0, TQT_TQOBJECT(this), TQT_SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" );
tmp_action = new TDEAction( i18n("Fold File Tree"), 0, this, TQT_SLOT(slotFoldTree()), m_filesAction, "view_fold_tree" );
tmp_action->setToolTip(i18n("Closes all branches of the file tree"));
/* caching */
tmp_action = new TDEAction( i18n("Update log cache"),0,TQT_TQOBJECT(this),TQT_SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" );
tmp_action = new TDEAction( i18n("Update log cache"),0,this,TQT_SLOT(slotUpdateLogCache()),m_filesAction,"update_log_cache" );
tmp_action->setToolTip(i18n("Update the log cache for current repository"));
/* tmp_action = new TDEAction( i18n("Stop update log cache"),0,this,TQT_SLOT(slotUpdateLogCache()),m_filesAction,"stop_update_log_cache" );
tmp_action->setToolTip(i18n("Stop the update of the log cache"));
@ -585,7 +585,7 @@ bool tdesvnfilelist::openURL( const KURL &url,bool noReinit )
}
m_SvnWrapper->clearUpdateCache();
if (isWorkingCopy()) {
m_pList->m_DirWatch=new KDirWatch(TQT_TQOBJECT(this));
m_pList->m_DirWatch=new KDirWatch(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&)));
@ -1041,7 +1041,7 @@ void tdesvnfilelist::slotSelectionChanged()
void tdesvnfilelist::slotClientException(const TQString&what)
{
emit sigLogMessage(what);
KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),what,i18n("SVN Error"));
KMessageBox::sorry(TDEApplication::activeModalWidget(),what,i18n("SVN Error"));
}
@ -1067,7 +1067,7 @@ void tdesvnfilelist::slotChangeToRepository()
return;
}
if (i.reposRoot().isEmpty()) {
KMessageBox::sorry(TQT_TQWIDGET(TDEApplication::activeModalWidget()),i18n("Could not retrieve repository of working copy."),i18n("SVN Error"));
KMessageBox::sorry(TDEApplication::activeModalWidget(),i18n("Could not retrieve repository of working copy."),i18n("SVN Error"));
} else {
sigSwitchUrl(i.reposRoot());
}
@ -1150,7 +1150,7 @@ template<class T> KDialogBase* tdesvnfilelist::createDialog(T**ptr,const TQStrin
buttons = buttons|KDialogBase::Help;
}
KDialogBase * dlg = new KDialogBase(
TQT_TQWIDGET(TQT_TQWIDGET(TDEApplication::activeModalWidget())),
TDEApplication::activeModalWidget(),
name,
true,
_head,

30
src/tdesvn.cpp
Unescape View File

@ -114,7 +114,7 @@ tdesvn::tdesvn()
// now that the Part is loaded, we cast it to a Part to get
// our hands on it
m_part = static_cast<KParts::ReadOnlyPart *>(cfa->createAppPart(this,"tdesvn_part", TQT_TQOBJECT(this), "tdesvn_part", "KParts::ReadOnlyPart",TQStringList()));
m_part = static_cast<KParts::ReadOnlyPart *>(cfa->createAppPart(this,"tdesvn_part", this, "tdesvn_part", "KParts::ReadOnlyPart",TQStringList()));
if (m_part)
{
@ -123,22 +123,22 @@ tdesvn::tdesvn()
TDEAction*tmpAction;
tmpAction = new TDEAction(i18n("Create and open new repository"),"document-new",
TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotCreateRepo()),actionCollection(),"subversion_create_repo");
TDEShortcut(),m_part->widget(),TQT_SLOT(slotCreateRepo()),actionCollection(),"subversion_create_repo");
tmpAction->setToolTip(i18n("Create and opens a new local subversion repository"));
tmpAction = new TDEAction(i18n("Dump repository to file"),"document-new",
TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotDumpRepo()),actionCollection(),"subversion_dump_repo");
TDEShortcut(),m_part->widget(),TQT_SLOT(slotDumpRepo()),actionCollection(),"subversion_dump_repo");
tmpAction->setToolTip(i18n("Dump a subversion repository to a file"));
tmpAction = new TDEAction(i18n("Hotcopy a repository"),"document-new",
TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotHotcopy()),actionCollection(),"subversion_hotcopy_repo");
TDEShortcut(),m_part->widget(),TQT_SLOT(slotHotcopy()),actionCollection(),"subversion_hotcopy_repo");
tmpAction->setToolTip(i18n("Hotcopy a subversion repository to a new folder"));
tmpAction = new TDEAction(i18n("Load dump into repository"),"document-new",
TDEShortcut(),TQT_TQOBJECT(m_part->widget()),TQT_SLOT(slotLoaddump()),actionCollection(),"subversion_load_repo");
TDEShortcut(),m_part->widget(),TQT_SLOT(slotLoaddump()),actionCollection(),"subversion_load_repo");
tmpAction->setToolTip(i18n("Load a dump file into a repository."));
tmpAction = new TDEAction(i18n("Add ssh identities to ssh-agent"),"password",
TDEShortcut(),TQT_TQOBJECT(m_part),TQT_SLOT(slotSshAdd()),actionCollection(),"tdesvn_ssh_add");
TDEShortcut(),m_part,TQT_SLOT(slotSshAdd()),actionCollection(),"tdesvn_ssh_add");
tmpAction->setToolTip(i18n("Force add ssh-identities to ssh-agent for future use."));
tmpAction = new TDEAction(i18n("Info about tdesvn part"), "tdesvn",
TDEShortcut(), TQT_TQOBJECT(m_part), TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
TDEShortcut(), m_part, TQT_SLOT(showAboutApplication()), actionCollection(), "help_about_tdesvnpart");
tmpAction->setToolTip(i18n("Shows info about the tdesvn plugin not the standalone app."));
/* enable tooltips in statusbar for menu */
@ -220,13 +220,13 @@ void tdesvn::load(const KURL& url,bool addRescent)
void tdesvn::setupActions()
{
TDEAction*ac;
KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());
KStdAction::openNew(TQT_TQOBJECT(this),TQT_SLOT(fileNew()),actionCollection());
ac = KStdAction::close(TQT_TQOBJECT(this),TQT_SLOT(fileClose()),actionCollection());
KStdAction::open(this, TQT_SLOT(fileOpen()), actionCollection());
KStdAction::openNew(this,TQT_SLOT(fileNew()),actionCollection());
ac = KStdAction::close(this,TQT_SLOT(fileClose()),actionCollection());
ac->setEnabled(getMemberList()->count()>1);
KStdAction::quit(TQT_TQOBJECT(kapp), TQT_SLOT(quit()), actionCollection());
KStdAction::quit(kapp, TQT_SLOT(quit()), actionCollection());
TDERecentFilesAction*rac = KStdAction::openRecent(TQT_TQOBJECT(this),TQT_SLOT(loadRescent(const KURL&)),actionCollection());
TDERecentFilesAction*rac = KStdAction::openRecent(this,TQT_SLOT(loadRescent(const KURL&)),actionCollection());
if (rac)
{
rac->setMaxItems(8);
@ -234,10 +234,10 @@ void tdesvn::setupActions()
rac->setText(i18n("Recent opened URLs"));
}
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureKeys()), actionCollection());
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection());
KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
m_statusbarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(optionsShowStatusbar()), actionCollection());
m_statusbarAction = KStdAction::showStatusbar(this, TQT_SLOT(optionsShowStatusbar()), actionCollection());
TDEToggleAction *toggletemp;
toggletemp = new TDEToggleAction(i18n("Load last opened URL on start"),TDEShortcut(),

14
src/tdesvnview.cpp
Unescape View File

@ -79,7 +79,7 @@ tdesvnView::tdesvnView(TDEActionCollection*aCollection,TQWidget *parent,const ch
m_LogWindow=new KTextBrowser(m_infoSplitter);
Propertylist*pl = new Propertylist(m_infoSplitter);
pl->setCommitchanges(true);
pl->addCallback(TQT_TQOBJECT(m_flist));
pl->addCallback(m_flist);
connect(m_flist,TQT_SIGNAL(sigProplist(const svn::PathPropertiesMapListPtr&,bool,const TQString&)),
pl,TQT_SLOT(displayList(const svn::PathPropertiesMapListPtr&,bool,const TQString&)));
@ -239,7 +239,7 @@ void tdesvnView::slotSettingsChanged()
void tdesvnView::slotCreateRepo()
{
KDialogBase * dlg = new KDialogBase(
TQT_TQWIDGET(TDEApplication::activeModalWidget()),
TDEApplication::activeModalWidget(),
"create_repository",
true,
i18n("Create new repository"),
@ -287,7 +287,7 @@ void tdesvnView::slotCreateRepo()
void tdesvnView::slotHotcopy()
{
KDialogBase * dlg = new KDialogBase(
TQT_TQWIDGET(TDEApplication::activeModalWidget()),
TDEApplication::activeModalWidget(),
"hotcopy_repository",
true,
i18n("Hotcopy a repository"),
@ -322,7 +322,7 @@ void tdesvnView::slotHotcopy()
void tdesvnView::slotLoaddump()
{
KDialogBase dlg(
TQT_TQWIDGET(TDEApplication::activeModalWidget()),
TDEApplication::activeModalWidget(),
"hotcopy_repository",
true,
i18n("Hotcopy a repository"),
@ -360,7 +360,7 @@ void tdesvnView::slotLoaddump()
break;
}
try {
StopDlg sdlg(TQT_TQOBJECT(this),this,0,"Load Dump",i18n("Loading a dump into a repository."));
StopDlg sdlg(this,this,0,"Load Dump",i18n("Loading a dump into a repository."));
_rep.loaddump(ptr->dumpFile(),_act,ptr->parentPath(),ptr->usePre(),ptr->usePost());
slotAppendLog(i18n("Loading dump finished."));
}catch (const svn::ClientException&e) {
@ -372,7 +372,7 @@ void tdesvnView::slotLoaddump()
void tdesvnView::slotDumpRepo()
{
KDialogBase * dlg = new KDialogBase(
TQT_TQWIDGET(TDEApplication::activeModalWidget()),
TDEApplication::activeModalWidget(),
"dump_repository",
true,
i18n("Dump a repository"),
@ -421,7 +421,7 @@ void tdesvnView::slotDumpRepo()
}
try {
StopDlg sdlg(TQT_TQOBJECT(this),this,0,"Dump",i18n("Dumping a repository"));
StopDlg sdlg(this,this,0,"Dump",i18n("Dumping a repository"));
_rep->dump(out,st,en,incr,diffs);
slotAppendLog(i18n("Dump finished."));
}catch (const svn::ClientException&e) {

Write Preview
Loading…
Cancel
Save