From e69e8b1d09fb579316595b4e6a850e717358a8b1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 19 Jun 2011 19:03:33 +0000 Subject: TQt4 port kdegraphics This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kviewshell/pageSize.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kviewshell/pageSize.cpp') diff --git a/kviewshell/pageSize.cpp b/kviewshell/pageSize.cpp index 43e21f74..a3e65459 100644 --- a/kviewshell/pageSize.cpp +++ b/kviewshell/pageSize.cpp @@ -77,10 +77,10 @@ bool pageSize::setPageSize(const TQString& name) } } - // Check if the string contains 'x'. If yes, we assume it is of type + // Check if the string tqcontains 'x'. If yes, we assume it is of type // "x". If yes, the first number is interpreted as // the width in mm, the second as the height in mm - if (name.find('x') >= 0) { + if (name.tqfind('x') >= 0) { bool wok, hok; float pageWidth_tmp = name.section('x',0,0).toFloat(&wok); float pageHeight_tmp = name.section('x',1,1).toFloat(&hok); @@ -95,10 +95,10 @@ bool pageSize::setPageSize(const TQString& name) } } - // Check if the string contains ','. If yes, we assume it is of type + // Check if the string tqcontains ','. If yes, we assume it is of type // ",". The first number is supposed to // be the width, the second the height. - if (name.find(',') >= 0) { + if (name.tqfind(',') >= 0) { bool wok, hok; float pageWidth_tmp = distance::convertToMM(name.section(',',0,0), &wok); float pageHeight_tmp = distance::convertToMM(name.section(',',1,1), &hok); @@ -263,7 +263,7 @@ TQString pageSize::formatName() const if (currentSize >= 0) return staticList[currentSize].name; else - return TQString::null; + return TQString(); } @@ -304,7 +304,7 @@ TQString pageSize::serialize() const if ((currentSize >= 0) && (fabs(staticList[currentSize].height-pageHeight.getLength_in_mm()) <= 0.5)) return staticList[currentSize].name; else - return TQString("%1x%2").arg(pageWidth.getLength_in_mm()).arg(pageHeight.getLength_in_mm()); + return TQString("%1x%2").tqarg(pageWidth.getLength_in_mm()).tqarg(pageHeight.getLength_in_mm()); } -- cgit v1.2.1