From d7633c195a464e4d344ada9eea61afd10110598a Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 4 May 2011 19:54:24 +0000 Subject: Port kdesvn to TQt4 This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1230412 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/svnfrontend/copymoveview_impl.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/svnfrontend/copymoveview_impl.cpp') diff --git a/src/svnfrontend/copymoveview_impl.cpp b/src/svnfrontend/copymoveview_impl.cpp index 24d3114..bfcd2ea 100644 --- a/src/svnfrontend/copymoveview_impl.cpp +++ b/src/svnfrontend/copymoveview_impl.cpp @@ -21,15 +21,15 @@ #include "copymoveview_impl.h" #include -#include -#include +#include +#include #include #include #include -#include +#include -CopyMoveView_impl::CopyMoveView_impl(const QString&baseName,const QString&sourceName,bool move,QWidget* parent, const char* name, WFlags fl) -: CopyMoveView(parent,name,fl) +CopyMoveView_impl::CopyMoveView_impl(const TQString&baseName,const TQString&sourceName,bool move,TQWidget* tqparent, const char* name, WFlags fl) +: CopyMoveView(tqparent,name,fl) { m_BaseName = baseName; if (m_BaseName.length()>0 && !m_BaseName.endsWith("/")) { @@ -39,7 +39,7 @@ CopyMoveView_impl::CopyMoveView_impl(const QString&baseName,const QString&source m_OldNameLabel->setText(""+sourceName+""); m_OldName = sourceName; if (m_BaseName.length()>0) { - QString t = m_OldName.right(m_OldName.length()-m_BaseName.length()); + TQString t = m_OldName.right(m_OldName.length()-m_BaseName.length()); m_NewNameInput->setText(t); } else { m_PrefixLabel->hide(); @@ -61,7 +61,7 @@ CopyMoveView_impl::~CopyMoveView_impl() /*! \fn CopyMoveView_impl::newName() */ -QString CopyMoveView_impl::newName() +TQString CopyMoveView_impl::newName() { return m_BaseName+m_NewNameInput->text(); } @@ -77,19 +77,19 @@ bool CopyMoveView_impl::force() /*! - \fn CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,const QString&old,const QString&base,QWidget*) + \fn CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,const TQString&old,const TQString&base,TQWidget*) */ -QString CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,bool move, - const QString&old,const QString&base,QWidget*parent,const char*name) +TQString CopyMoveView_impl::getMoveCopyTo(bool*ok,bool*force,bool move, + const TQString&old,const TQString&base,TQWidget*tqparent,const char*name) { - KDialogBase dlg(parent,name,true,(move?i18n("Move/Rename file/dir"):i18n("Copy file/dir")), + KDialogBase dlg(tqparent,name,true,(move?i18n("Move/Rename file/dir"):i18n("Copy file/dir")), KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::NoDefault); - QWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); + TQWidget* Dialog1Layout = dlg.makeVBoxMainWidget(); CopyMoveView_impl*ptr=new CopyMoveView_impl(base,old,(move),Dialog1Layout); - QString nName = QString::null; - dlg.resize( QSize(500,160).expandedTo(dlg.minimumSizeHint()) ); - if (dlg.exec()!=QDialog::Accepted) { + TQString nName = TQString(); + dlg.resize( TQSize(500,160).expandedTo(dlg.tqminimumSizeHint()) ); + if (dlg.exec()!=TQDialog::Accepted) { if (ok) *ok = false; } else { if (force) *force = ptr->force(); -- cgit v1.2.1