From 44a28c50e84c12e283887ae790607c335bb54fa6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:01:18 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- src/svnfrontend/svnactions.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/svnfrontend/svnactions.cpp') diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp index a44dc25..729a8b9 100644 --- a/src/svnfrontend/svnactions.cpp +++ b/src/svnfrontend/svnactions.cpp @@ -252,7 +252,7 @@ template KDialogBase* SvnActions::createDialog(T**ptr,const TQString&_h buttons = buttons|KDialogBase::User1; } KDialogBase * dlg = new KDialogBase( - modal?TQT_TQWIDGET(TQT_TQWIDGET(KApplication::activeModalWidget())):0, // parent + modal?TQT_TQWIDGET(TQT_TQWIDGET(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..."< logs = getLog(start,end,peg,which,list_files,limit); if (!logs) return; - bool need_modal = m_Data->runblocked||TQT_TQWIDGET(KApplication::activeModalWidget())!=0; + bool need_modal = m_Data->runblocked||TQT_TQWIDGET(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(KApplication::activeModalWidget())!=0; + bool need_modal = m_Data->runblocked||TQT_TQWIDGET(TDEApplication::activeModalWidget())!=0; if (need_modal||!m_Data->m_DiffBrowserPtr||!m_Data->m_DiffDialog) { DiffBrowser*ptr; -- cgit v1.2.3