summaryrefslogtreecommitdiffstats
path: root/src/svnfrontend/svnactions.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/svnfrontend/svnactions.cpp')
-rw-r--r--src/svnfrontend/svnactions.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 9ecb6bc..222d6f1 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -199,14 +199,14 @@ public:
#define EMIT_REFRESH emit sigRefreshAll()
#define DIALOGS_SIZES "display_dialogs_sizes"
-SvnActions::SvnActions(ItemDisplay *tqparent, const char *name,bool processes_blocked)
- : TQObject(tqparent?tqparent->realWidget():0, name),SimpleLogCb()
+SvnActions::SvnActions(ItemDisplay *parent, const char *name,bool processes_blocked)
+ : TQObject(parent?parent->realWidget():0, name),SimpleLogCb()
{
m_CThread = 0;
m_UThread = 0;
m_FCThread = 0;
m_Data = new SvnActionsData();
- m_Data->m_ParentList = tqparent;
+ m_Data->m_ParentList = parent;
m_Data->m_SvnContextListener = new CContextListener(this);
m_Data->runblocked = processes_blocked;
connect(m_Data->m_SvnContextListener,TQT_SIGNAL(sendNotify(const TQString&)),this,TQT_SLOT(slotNotifyMessage(const TQString&)));
@@ -252,11 +252,11 @@ template<class T> KDialogBase* SvnActions::createDialog(T**ptr,const TQString&_h
buttons = buttons|KDialogBase::User1;
}
KDialogBase * dlg = new KDialogBase(
- modal?TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())):0, // tqparent
+ modal?TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())):0, // parent
name, // name
modal, // modal
_head, // caption
- buttons, // buttontqmask
+ buttons, // buttonmask
KDialogBase::Ok, // defaultButton
false , // separator
(u1.text().isEmpty()?KGuiItem():u1) //user1
@@ -280,7 +280,7 @@ void SvnActions::makeLog(const svn::Revision&start,const svn::Revision&end,const
}
svn::SharedPointer<svn::LogEntriesMap> SvnActions::getLog(const svn::Revision&start,const svn::Revision&end,const svn::Revision&peg,const TQString&which,bool list_files,
- int limit,TQWidget*tqparent)
+ int limit,TQWidget*parent)
{
svn::SharedPointer<svn::LogEntriesMap> logs = new svn::LogEntriesMap;
if (!m_Data->m_CurrentContext) return 0;
@@ -289,7 +289,7 @@ svn::SharedPointer<svn::LogEntriesMap> SvnActions::getLog(const svn::Revision&st
kdDebug()<<"Get logs for "<< which<<endl;
try {
- StopDlg sdlg(m_Data->m_SvnContextListener,(tqparent?tqparent:m_Data->m_ParentList->realWidget()),0,"Logs",
+ StopDlg sdlg(m_Data->m_SvnContextListener,(parent?parent:m_Data->m_ParentList->realWidget()),0,"Logs",
i18n("Getting logs - hit cancel for abort"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
if (doNetworking()) {
@@ -522,12 +522,12 @@ void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end,co
svn::AnnotatedFile blame;
TQString ex;
svn::Path p(k);
- TQWidget*_tqparent = _p?_p:m_Data->m_ParentList->realWidget();
+ TQWidget*_parent = _p?_p:m_Data->m_ParentList->realWidget();
svn::Revision peg = _peg==svn::Revision::UNDEFINED?end:_peg;
try {
CursorStack a(TQt::BusyCursor);
- StopDlg sdlg(m_Data->m_SvnContextListener,_tqparent,0,"Annotate",i18n("Annotate lines - hit cancel for abort"));
+ StopDlg sdlg(m_Data->m_SvnContextListener,_parent,0,"Annotate",i18n("Annotate lines - hit cancel for abort"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
m_Data->m_Svnclient->annotate(blame,p,start,end,peg);
} catch (const svn::Exception&e) {
@@ -544,11 +544,11 @@ void SvnActions::makeBlame(const svn::Revision&start, const svn::Revision&end,co
}
bool SvnActions::makeGet(const svn::Revision&start, const TQString&what, const TQString&target,
- const svn::Revision&peg,TQWidget*_dlgtqparent)
+ const svn::Revision&peg,TQWidget*_dlgparent)
{
if (!m_Data->m_CurrentContext) return false;
CursorStack a(TQt::BusyCursor);
- TQWidget*dlgp=_dlgtqparent?_dlgtqparent:m_Data->m_ParentList->realWidget();
+ TQWidget*dlgp=_dlgparent?_dlgparent:m_Data->m_ParentList->realWidget();
TQString ex;
svn::Path p(what);
try {
@@ -567,11 +567,11 @@ bool SvnActions::makeGet(const svn::Revision&start, const TQString&what, const T
return true;
}
-void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, const TQString&disp,const svn::Revision&peg,TQWidget*_dlgtqparent)
+void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, const TQString&disp,const svn::Revision&peg,TQWidget*_dlgparent)
{
KTempFile content;
content.setAutoDelete(true);
- if (!makeGet(start,what,content.name(),peg,_dlgtqparent)) {
+ if (!makeGet(start,what,content.name(),peg,_dlgparent)) {
return;
}
EMIT_FINISHED;
@@ -609,7 +609,7 @@ void SvnActions::slotMakeCat(const svn::Revision&start, const TQString&what, con
delete dlg;
}
} else {
- KMessageBox::information(_dlgtqparent?_dlgtqparent:m_Data->m_ParentList->realWidget(),
+ KMessageBox::information(_dlgparent?_dlgparent:m_Data->m_ParentList->realWidget(),
i18n("Got no content."));
}
}
@@ -1234,7 +1234,7 @@ void SvnActions::makeDiffinternal(const TQString&p1,const svn::Revision&r1,const
tdir.setAutoDelete(true);
TQString tn = TQString("%1/%2").tqarg(tdir.name()).tqarg("/svndiff");
bool ignore_content = Kdesvnsettings::diff_ignore_content();
- TQWidget*tqparent = p?p:m_Data->m_ParentList->realWidget();
+ TQWidget*parent = p?p:m_Data->m_ParentList->realWidget();
TQStringList extraOptions;
if (Kdesvnsettings::diff_ignore_spaces())
{
@@ -1247,7 +1247,7 @@ void SvnActions::makeDiffinternal(const TQString&p1,const svn::Revision&r1,const
svn::Revision peg = _peg==svn::Revision::UNDEFINED?r2:_peg;
try {
- StopDlg sdlg(m_Data->m_SvnContextListener,tqparent,0,"Diffing",
+ StopDlg sdlg(m_Data->m_SvnContextListener,parent,0,"Diffing",
i18n("Diffing - hit cancel for abort"));
connect(this,TQT_SIGNAL(sigExtraLogMsg(const TQString&)),&sdlg,TQT_SLOT(slotExtraMessage(const TQString&)));
if (p1==p2 && (r1.isRemote()||r2.isRemote())) {
@@ -1523,7 +1523,7 @@ void SvnActions::makeAdd(bool rec)
++liter;
//cur->refreshtqStatus();
- //emit sigRefreshCurrent(static_cast<FileListViewItem*>(cur->tqparent()));
+ //emit sigRefreshCurrent(static_cast<FileListViewItem*>(cur->parent()));
}
#else
emit sigRefreshCurrent(0);