summaryrefslogtreecommitdiffstats
path: root/kugar/lib
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:38:41 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-19 11:38:41 -0600
commitf0de9e167e289ab7dc33e57f077c1f04ec7c68c8 (patch)
tree1fc538e179833e62caec21956bfe47a252be5a72 /kugar/lib
parent11191ef0b9908604d1d7aaca382b011ef22c454c (diff)
downloadkoffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.tar.gz
koffice-f0de9e167e289ab7dc33e57f077c1f04ec7c68c8.zip
Remove additional unneeded tq method conversions
Diffstat (limited to 'kugar/lib')
-rw-r--r--kugar/lib/mlabelobject.cpp10
-rw-r--r--kugar/lib/mlabelobject.h12
-rw-r--r--kugar/lib/mlineobject.cpp4
-rw-r--r--kugar/lib/mreportengine.cpp32
-rw-r--r--kugar/lib/mreportobject.cpp4
-rw-r--r--kugar/lib/mreportsection.cpp4
-rw-r--r--kugar/lib/mreportviewer.cpp8
-rw-r--r--kugar/lib/mutil.cpp24
8 files changed, 49 insertions, 49 deletions
diff --git a/kugar/lib/mlabelobject.cpp b/kugar/lib/mlabelobject.cpp
index 6a0db974..fecbd560 100644
--- a/kugar/lib/mlabelobject.cpp
+++ b/kugar/lib/mlabelobject.cpp
@@ -29,7 +29,7 @@ MLabelObject::MLabelObject() : MReportObject(), xMargin( 0 ), yMargin( 0 )
fontWeight = MLabelObject::Normal;
fontItalic = false;
- // Set the default tqalignment
+ // Set the default alignment
hAlignment = MLabelObject::Left;
vAlignment = MLabelObject::Top;
wordWrap = false;
@@ -76,13 +76,13 @@ void MLabelObject::setFont( const TQString family, int size, int weight, bool it
fontItalic = italic;
}
-/** Sets the label's horizontal tqalignment */
+/** Sets the label's horizontal alignment */
void MLabelObject::setHorizontalAlignment( int a )
{
hAlignment = a;
}
-/** Sets the label's vertical tqalignment */
+/** Sets the label's vertical alignment */
void MLabelObject::setVerticalAlignment( int a )
{
vAlignment = a;
@@ -113,7 +113,7 @@ void MLabelObject::draw( TQPainter* p, int xoffset, int yoffset )
p->setFont( font );
TQFontMetrics fm = p->fontMetrics();
- // Set the text tqalignment flags
+ // Set the text alignment flags
//Qt::Horizontal
switch ( hAlignment )
@@ -165,7 +165,7 @@ void MLabelObject::copy( const MLabelObject* mLabelObject )
fontWeight = mLabelObject->fontWeight;
fontItalic = mLabelObject->fontItalic;
- // Copy the label's tqalignment data
+ // Copy the label's alignment data
vAlignment = mLabelObject->vAlignment;
hAlignment = mLabelObject->hAlignment;
wordWrap = mLabelObject->wordWrap;
diff --git a/kugar/lib/mlabelobject.h b/kugar/lib/mlabelobject.h
index 2b35f233..3526552e 100644
--- a/kugar/lib/mlabelobject.h
+++ b/kugar/lib/mlabelobject.h
@@ -27,9 +27,9 @@ class MLabelObject : public MReportObject
public:
/** Font weight constants */
enum FontWeight { Light = 25, Normal = 50, DemiBold = 63, Bold = 75, Black = 87 };
- /**Qt::Horizontal tqalignment constants */
+ /**Qt::Horizontal alignment constants */
enum HAlignment { Left = 0, Center, Right };
- /** Vertial tqalignment constants */
+ /** Vertial alignment constants */
enum VAlignment { Top = 0, Middle, Bottom };
/** Constructor */
@@ -52,9 +52,9 @@ protected:
int fontWeight;
/** Label text font italic flag */
bool fontItalic;
- /** Lable text horizontal tqalignment */
+ /** Lable text horizontal alignment */
int hAlignment;
- /** Label text vertical tqalignment */
+ /** Label text vertical alignment */
int vAlignment;
/** Label text word wrap flag */
bool wordWrap;
@@ -70,9 +70,9 @@ public:
virtual void setText( const TQString txt );
/** Sets the label's text font - default is Times,10,Normal,false */
void setFont( const TQString family, int size, int weight, bool italic );
- /** Sets the label's horizontal tqalignment -default is Left */
+ /** Sets the label's horizontal alignment -default is Left */
void setHorizontalAlignment( int a );
- /** Sets the label's vertical tqalignment - default is Top */
+ /** Sets the label's vertical alignment - default is Top */
void setVerticalAlignment( int a );
/** Sets the label's word wrap flag - default is false */
void setWordWrap( bool state );
diff --git a/kugar/lib/mlineobject.cpp b/kugar/lib/mlineobject.cpp
index 2a4a0bc9..abd7927c 100644
--- a/kugar/lib/mlineobject.cpp
+++ b/kugar/lib/mlineobject.cpp
@@ -14,7 +14,7 @@ namespace Kugar
/** Constructor */
MLineObject::MLineObject() : TQObject()
{
- // Set the object's default tqgeometry
+ // Set the object's default geometry
xpos1 = 0;
ypos1 = 0;
xpos2 = 0;
@@ -104,7 +104,7 @@ void MLineObject::drawBase( TQPainter* p, int xoffset, int yoffset )
Used by the copy constructor and assignment operator */
void MLineObject::copy( const MLineObject* mLineObject )
{
- // Copy the object's tqgeometry
+ // Copy the object's geometry
xpos1 = mLineObject->xpos1;
ypos1 = mLineObject->ypos1;
xpos2 = mLineObject->xpos2;
diff --git a/kugar/lib/mreportengine.cpp b/kugar/lib/mreportengine.cpp
index 77f402ed..2263ba61 100644
--- a/kugar/lib/mreportengine.cpp
+++ b/kugar/lib/mreportengine.cpp
@@ -652,21 +652,21 @@ void MReportEngine::recalcDimensions()
recalcAttribute( "LeftMargin", rattributes );
recalcAttribute( "RightMargin", rattributes );
- TQDomNodeList tqchildren = report.childNodes();
- int childCount = tqchildren.length();
+ TQDomNodeList children = report.childNodes();
+ int childCount = children.length();
for ( int j = 0; j < childCount; j++ )
{
- child = tqchildren.item( j );
+ child = children.item( j );
TQDomNamedNodeMap attributes = child.attributes();
- TQDomNodeList tqchildren2 = child.childNodes();
- int childCount2 = tqchildren2.length();
+ TQDomNodeList children2 = child.childNodes();
+ int childCount2 = children2.length();
recalcAttribute( "Height", attributes );
for ( int k = 0; k < childCount2; k++ )
{
- TQDomNode child2 = tqchildren2.item( k );
+ TQDomNode child2 = children2.item( k );
TQDomNamedNodeMap attributes = child2.attributes();
recalcAttribute( "X", attributes );
recalcAttribute( "Y", attributes );
@@ -685,7 +685,7 @@ void MReportEngine::recalcAttribute( const TQString& name, TQDomNamedNodeMap att
{
if ( !attributes.namedItem( name ).isNull() )
{
- attributes.namedItem( name ).setNodeValue( TQString( "%1" ).tqarg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) );
+ attributes.namedItem( name ).setNodeValue( TQString( "%1" ).arg( attributes.namedItem( name ).nodeValue().toInt() * 93 / 81 ) );
}
}
@@ -712,12 +712,12 @@ void MReportEngine::initTemplate()
setReportAttributes( &report );
// Get all the child report elements
- TQDomNodeList tqchildren = report.childNodes();
- int childCount = tqchildren.length();
+ TQDomNodeList children = report.childNodes();
+ int childCount = children.length();
for ( int j = 0; j < childCount; j++ )
{
- child = tqchildren.item( j );
+ child = children.item( j );
if ( child.nodeType() == TQDomNode::ElementNode )
{
@@ -803,14 +803,14 @@ void MReportEngine::setSectionAttributes( MReportSection* section, TQDomNode* re
section->setPrintFrequency( attributes.namedItem( "PrintFrequency" ).nodeValue().toInt() );
// Process the sections labels
- TQDomNodeList tqchildren = report->childNodes();
- int childCount = tqchildren.length();
+ TQDomNodeList children = report->childNodes();
+ int childCount = children.length();
// For each label, extract the attr list and add the new label
// to the sections's label collection
for ( int j = 0; j < childCount; j++ )
{
- TQDomNode child = tqchildren.item( j );
+ TQDomNode child = children.item( j );
if ( child.nodeType() == TQDomNode::ElementNode )
{
if ( child.nodeName() == "Line" )
@@ -881,12 +881,12 @@ void MReportEngine::setDetailAttributes( TQDomNode* report )
detail->setRepeat( attributes.namedItem( "Repeat" ).nodeValue() == "true" );
// Process the report detail labels
- TQDomNodeList tqchildren = report->childNodes();
- int childCount = tqchildren.length();
+ TQDomNodeList children = report->childNodes();
+ int childCount = children.length();
for ( int j = 0; j < childCount; j++ )
{
- TQDomNode child = tqchildren.item( j );
+ TQDomNode child = children.item( j );
if ( child.nodeType() == TQDomNode::ElementNode )
{
if ( child.nodeName() == "Line" )
diff --git a/kugar/lib/mreportobject.cpp b/kugar/lib/mreportobject.cpp
index 7fec9dd9..7a9366f6 100644
--- a/kugar/lib/mreportobject.cpp
+++ b/kugar/lib/mreportobject.cpp
@@ -16,7 +16,7 @@ namespace Kugar
/** Constructor */
MReportObject::MReportObject() : TQObject()
{
- // Set the object's default tqgeometry
+ // Set the object's default geometry
xpos = 0;
ypos = 0;
width = 40;
@@ -166,7 +166,7 @@ void MReportObject::setBorderStyle( int style )
Used by the copy constructor and assignment operator */
void MReportObject::copy( const MReportObject* mReportObject )
{
- // Copy the object's tqgeometry
+ // Copy the object's geometry
xpos = mReportObject->xpos;
ypos = mReportObject->ypos;
width = mReportObject->width;
diff --git a/kugar/lib/mreportsection.cpp b/kugar/lib/mreportsection.cpp
index 5040d64c..b412d332 100644
--- a/kugar/lib/mreportsection.cpp
+++ b/kugar/lib/mreportsection.cpp
@@ -17,7 +17,7 @@ namespace Kugar
/** Constructor */
MReportSection::MReportSection()
{
- // Set tqgeometry
+ // Set geometry
height = 50;
// Set print frequency
@@ -293,7 +293,7 @@ void MReportSection::drawObjects( TQPainter* p, int xoffset, int yoffset )
Used by the copy constructor and assignment operator */
void MReportSection::copy( const MReportSection* mReportSection )
{
- // Copy the section's tqgeometry
+ // Copy the section's geometry
height = mReportSection->height;
// Copy the print frequency
diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp
index 9e7f02d1..5cbacf58 100644
--- a/kugar/lib/mreportviewer.cpp
+++ b/kugar/lib/mreportviewer.cpp
@@ -175,7 +175,7 @@ void MReportViewer::slotFirstPage()
if ( ( page = report->getFirstPage() ) != 0 )
{
display->setPage( page );
- display->tqrepaint();
+ display->repaint();
}
}
@@ -192,7 +192,7 @@ void MReportViewer::slotNextPage()
if ( ( page = report->getNextPage() ) != 0 )
{
display->setPage( page );
- display->tqrepaint();
+ display->repaint();
}
else
report->setCurrentPage( index );
@@ -211,7 +211,7 @@ void MReportViewer::slotPrevPage()
if ( ( page = report->getPreviousPage() ) != 0 )
{
display->setPage( page );
- display->tqrepaint();
+ display->repaint();
}
else
report->setCurrentPage( index );
@@ -228,7 +228,7 @@ void MReportViewer::slotLastPage()
if ( ( page = report->getLastPage() ) != 0 )
{
display->setPage( page );
- display->tqrepaint();
+ display->repaint();
}
}
diff --git a/kugar/lib/mutil.cpp b/kugar/lib/mutil.cpp
index f70b67bf..e53c1ef2 100644
--- a/kugar/lib/mutil.cpp
+++ b/kugar/lib/mutil.cpp
@@ -40,40 +40,40 @@ TQString MUtil::formatDate( const TQDate& value, int format )
switch ( format )
{
case MUtil::MDY_SLASH:
- string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year );
+ string = TQString( "%1/%2/%3" ).arg( value.month() ).arg( value.day() ).arg( year );
break;
case MUtil::MDY_DASH:
- string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( year );
+ string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( year );
break;
case MUtil::MMDDY_SLASH:
- string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( year );
+ string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( year );
break;
case MUtil::MMDDY_DASH:
- string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( year );
+ string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( year );
break;
case MUtil::MDYYYY_SLASH:
- string = TQString( "%1/%2/%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() );
+ string = TQString( "%1/%2/%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() );
break;
case MUtil::MDYYYY_DASH:
- string = TQString( "%1-%2-%3" ).tqarg( value.month() ).tqarg( value.day() ).tqarg( value.year() );
+ string = TQString( "%1-%2-%3" ).arg( value.month() ).arg( value.day() ).arg( value.year() );
break;
case MUtil::MMDDYYYY_SLASH:
- string = TQString( "%1/%2/%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() );
+ string = TQString( "%1/%2/%3" ).arg( month ).arg( day ).arg( value.year() );
break;
case MUtil::MMDDYYYY_DASH:
- string = TQString( "%1-%2-%3" ).tqarg( month ).tqarg( day ).tqarg( value.year() );
+ string = TQString( "%1-%2-%3" ).arg( month ).arg( day ).arg( value.year() );
break;
case MUtil::YYYYMD_SLASH:
- string = TQString( "%1/%2/%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() );
+ string = TQString( "%1/%2/%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() );
break;
case MUtil::YYYYMD_DASH:
- string = TQString( "%1-%2-%3" ).tqarg( value.year() ).tqarg( value.month() ).tqarg( value.day() );
+ string = TQString( "%1-%2-%3" ).arg( value.year() ).arg( value.month() ).arg( value.day() );
break;
case MUtil::DDMMYY_PERIOD:
- string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( year );
+ string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( year );
break;
case MUtil::DDMMYYYY_PERIOD:
- string = TQString( "%1.%2.%3" ).tqarg( day ).tqarg( month ).tqarg( value.year() );
+ string = TQString( "%1.%2.%3" ).arg( day ).arg( month ).arg( value.year() );
break;
default:
string = value.toString();