From 48d4a26399959121f33d2bc3bfe51c7827b654fc Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 14 Jun 2011 16:45:05 +0000 Subject: TQt4 port kdevelop This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- vcs/cvsservice/diffdialog.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vcs/cvsservice/diffdialog.cpp') diff --git a/vcs/cvsservice/diffdialog.cpp b/vcs/cvsservice/diffdialog.cpp index 9d592c8b..fd4ca8ef 100644 --- a/vcs/cvsservice/diffdialog.cpp +++ b/vcs/cvsservice/diffdialog.cpp @@ -20,8 +20,8 @@ // class DiffDialog /////////////////////////////////////////////////////////////////////////////// -DiffDialog::DiffDialog( const CVSEntry &entry, TQWidget *parent, const char *name, WFlags f ) - : DiffDialogBase( parent, name, true, f) +DiffDialog::DiffDialog( const CVSEntry &entry, TQWidget *tqparent, const char *name, WFlags f ) + : DiffDialogBase( tqparent, name, true, f) { m_entry = entry; TQString currentRevision = entry.revision(); @@ -62,7 +62,7 @@ TQString DiffDialog::revA() const else if (requestedDiff() == diffLocalHEAD) return "HEAD"; else - return TQString::null; + return TQString(); } /////////////////////////////////////////////////////////////////////////////// @@ -72,7 +72,7 @@ TQString DiffDialog::revB() const if (requestedDiff()) return this->revbEdit->text(); else - return TQString::null; + return TQString(); } /////////////////////////////////////////////////////////////////////////////// @@ -83,7 +83,7 @@ void DiffDialog::languageChange() { //FIXME: We need a function in CVSEntry to return the latest revision there is in cvs // if(!m_entry.revision().isNull()) -// diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).arg( m_entry.revision()) ); +// diffLocalHeadRadio->setText( tr2i18n( "Local copy and &HEAD (%1)" ).tqarg( m_entry.revision()) ); } #include "diffdialog.moc" -- cgit v1.2.3