summaryrefslogtreecommitdiffstats
path: root/kig/filters
diff options
context:
space:
mode:
Diffstat (limited to 'kig/filters')
-rw-r--r--kig/filters/cabri-filter.cc2
-rw-r--r--kig/filters/drgeo-filter-chooserbase.ui10
-rw-r--r--kig/filters/drgeo-filter.cc34
-rw-r--r--kig/filters/drgeo-filter.h2
-rw-r--r--kig/filters/filters-common.cc2
-rw-r--r--kig/filters/imageexporteroptionsbase.ui4
-rw-r--r--kig/filters/kgeo-filter.cc4
-rw-r--r--kig/filters/kgeo-filter.h4
-rw-r--r--kig/filters/kgeo-resource.h2
-rw-r--r--kig/filters/kseg-filter.cc10
-rw-r--r--kig/filters/latexexporter.cc2
-rw-r--r--kig/filters/latexexporteroptions.ui4
-rw-r--r--kig/filters/native-filter.cc4
-rw-r--r--kig/filters/svgexporteroptions.ui4
14 files changed, 44 insertions, 44 deletions
diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cc
index 1413d56a..3cadf522 100644
--- a/kig/filters/cabri-filter.cc
+++ b/kig/filters/cabri-filter.cc
@@ -548,7 +548,7 @@ KigDocument* KigFilterCabri::load( const TQString& file )
}
else
{
- notSupported( file, i18n( "This Cabri file tqcontains a \"%1\" object, "
+ notSupported( file, i18n( "This Cabri file contains a \"%1\" object, "
"which Kig does not currently support." ).arg( obj.type ) );
return 0;
}
diff --git a/kig/filters/drgeo-filter-chooserbase.ui b/kig/filters/drgeo-filter-chooserbase.ui
index c842721f..829d84cc 100644
--- a/kig/filters/drgeo-filter-chooserbase.ui
+++ b/kig/filters/drgeo-filter-chooserbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>KigFilterDrgeoChooserBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -30,10 +30,10 @@
<cstring>ExplanationTextLabel</cstring>
</property>
<property name="text">
- <string>The current Dr. Geo file tqcontains more than one figure.
+ <string>The current Dr. Geo file contains more than one figure.
Please select which to import:</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@@ -96,7 +96,7 @@ Please select which to import:</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>20</height>
@@ -131,7 +131,7 @@ Please select which to import:</string>
</widget>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>klistbox.h</includehint>
<includehint>kpushbutton.h</includehint>
diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cc
index d43c4729..82438a57 100644
--- a/kig/filters/drgeo-filter.cc
+++ b/kig/filters/drgeo-filter.cc
@@ -105,7 +105,7 @@ KigDocument* KigFilterDrgeo::load( const TQString& file )
}
if ( figures.isEmpty() ) {
if( nmacros > 0 )
- warning( i18n( "The Dr. Geo file \"%1\" is a macro file so it tqcontains no "
+ warning( i18n( "The Dr. Geo file \"%1\" is a macro file so it contains no "
"figures." ).arg( file ) );
else
warning( i18n( "There are no figures in Dr. Geo file \"%1\"." ).arg( file ) );
@@ -332,7 +332,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
else
{
// oc = fact->constrainedPointCalcer( parents[0], value );
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -369,7 +369,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
type = ArcLineIntersectionType::instance();
else
{
- notSupported( file, i18n( "This Dr. Geo file tqcontains an intersection type, "
+ notSupported( file, i18n( "This Dr. Geo file contains an intersection type, "
"which Kig does not currently support." ) );
return false;
}
@@ -386,7 +386,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
oc = new ObjectTypeCalcer( RotationType::instance(), parents );
else
{
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -418,7 +418,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
type = CircleBCPType::instance();
else
{
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -431,7 +431,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
type = ArcBTPType::instance();
else
{
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -452,7 +452,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
}
else
{
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -468,7 +468,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
}
else
{
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -489,7 +489,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
oc = new ObjectTypeCalcer( RotationType::instance(), parents );
else
{
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -617,7 +617,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
}
else
{
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -635,7 +635,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
}
else
{
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -676,7 +676,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
oc = fact->labelCalcer( text, Coordinate( x, y ), false, std::vector<ObjectCalcer*>(), *ret );
else
{
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -688,7 +688,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
oc = fact->locusCalcer( parents[0], parents[1] );
else
{
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -708,7 +708,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
#ifdef DRGEO_DEBUG
kdDebug() << ">>>>>>>>> UNKNOWN OBJECT" << endl;
#endif
- notSupported( file, i18n( "This Dr. Geo file tqcontains a \"%1 %2\" object, "
+ notSupported( file, i18n( "This Dr. Geo file contains a \"%1 %2\" object, "
"which Kig does not currently support." ).arg( domelem.tagName() ).arg(
domelem.attribute( "type" ) ) );
return false;
@@ -747,8 +747,8 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
TQString ps = domelem.attribute( "style" );
int pointstyle = ObjectDrawer::pointStyleFromString( ps );
// show this object?
- bool show = ( ( domelem.attribute( "tqmasked" ) != "True" ) &&
- ( domelem.attribute( "tqmasked" ) != "Alway" ) );
+ bool show = ( ( domelem.attribute( "masked" ) != "True" ) &&
+ ( domelem.attribute( "masked" ) != "Alway" ) );
// costructing the ObjectDrawer*
ObjectDrawer* d = new ObjectDrawer( co, w, show, s, pointstyle );
// reading object name
@@ -770,7 +770,7 @@ KigDocument* KigFilterDrgeo::importFigure( TQDomNode f, const TQString& file, co
{
std::vector<ObjectCalcer*> args2;
args2.push_back( o->nameCalcer() );
- oc2 = fact->attachedLabelCalcer( TQString::tqfromLatin1( "%1" ), oc,
+ oc2 = fact->attachedLabelCalcer( TQString::fromLatin1( "%1" ), oc,
static_cast<const PointImp*>( oc->imp() )->coordinate(),
false, args2, *ret );
co = Qt::black;
diff --git a/kig/filters/drgeo-filter.h b/kig/filters/drgeo-filter.h
index ddd2359e..9b0ef369 100644
--- a/kig/filters/drgeo-filter.h
+++ b/kig/filters/drgeo-filter.h
@@ -26,7 +26,7 @@ class KigDocument;
class TQString;
/**
- * This is an import filter for the GNOME tqgeometry program DrGeo.
+ * This is an import filter for the GNOME geometry program DrGeo.
*/
class KigFilterDrgeo
: public KigFilter
diff --git a/kig/filters/filters-common.cc b/kig/filters/filters-common.cc
index 6ae6cef9..4ba24e9f 100644
--- a/kig/filters/filters-common.cc
+++ b/kig/filters/filters-common.cc
@@ -34,6 +34,6 @@ ObjectTypeCalcer* filtersConstructTextObject(
propo->calc( doc );
std::vector<ObjectCalcer*> args;
args.push_back( propo );
- return fact->labelCalcer( TQString::tqfromLatin1( "%1" ), c, needframe,
+ return fact->labelCalcer( TQString::fromLatin1( "%1" ), c, needframe,
args, doc );
}
diff --git a/kig/filters/imageexporteroptionsbase.ui b/kig/filters/imageexporteroptionsbase.ui
index ec126c96..03145dec 100644
--- a/kig/filters/imageexporteroptionsbase.ui
+++ b/kig/filters/imageexporteroptionsbase.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>ImageExporterOptionsBase</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -144,7 +144,7 @@
</widget>
</vbox>
</widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
<includehint>knuminput.h</includehint>
<includehint>knuminput.h</includehint>
diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cc
index 1ce9a27e..02c1efde 100644
--- a/kig/filters/kgeo-filter.cc
+++ b/kig/filters/kgeo-filter.cc
@@ -130,7 +130,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
elems.push_back( elem );
for ( const char* parent = parents.first(); parent; parent = parents.next() )
{
- int parentIndex = TQString::tqfromLatin1( parent ).toInt( &ok );
+ int parentIndex = TQString::fromLatin1( parent ).toInt( &ok );
if ( ! ok ) KIG_FILTER_PARSE_ERROR;
if ( parentIndex != 0 )
elems[i].parents.push_back( parentIndex - 1 );
@@ -310,7 +310,7 @@ KigDocument* KigFilterKGeo::loadObjects( const TQString& file, KSimpleConfig* c
}
case ID_slope:
{
- // if parents tqcontains a segment, line, vector or whatever, we
+ // if parents contains a segment, line, vector or whatever, we
// take its parents cause we want points..
if ( parents.size() == 1 ) parents = parents[0]->parents();
if ( parents.size() != 2 ) KIG_FILTER_PARSE_ERROR;
diff --git a/kig/filters/kgeo-filter.h b/kig/filters/kgeo-filter.h
index 0eb8d462..f8accd91 100644
--- a/kig/filters/kgeo-filter.h
+++ b/kig/filters/kgeo-filter.h
@@ -25,11 +25,11 @@ class KSimpleConfig;
/**
* This is an import filter for files generated by the program KGeo,
- * which was an interactive tqgeometry program in kdeedu. Kig is
+ * which was an interactive geometry program in kdeedu. Kig is
* supposed to be its successor, and this import filter is part of my
* attempt to achieve that :)
*
- * tqStatus: a significant part of KGeo's format is supported, not all
+ * Status: a significant part of KGeo's format is supported, not all
* yet, though..
*/
class KigFilterKGeo
diff --git a/kig/filters/kgeo-resource.h b/kig/filters/kgeo-resource.h
index ce149605..f7af0f64 100644
--- a/kig/filters/kgeo-resource.h
+++ b/kig/filters/kgeo-resource.h
@@ -51,7 +51,7 @@
#include <klocale.h>
///////////////////////////////////////////////////////////////////
-// resource.h -- tqcontains macros used for commands
+// resource.h -- contains macros used for commands
///////////////////////////////////////////////////////////////////
diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cc
index 5ad746b7..fb96c25c 100644
--- a/kig/filters/kseg-filter.cc
+++ b/kig/filters/kseg-filter.cc
@@ -67,7 +67,7 @@ bool KigFilterKSeg::supportMime( const TQString& mime )
struct drawstyle
{
- TQ_INT8 pointstyle;
+ Q_INT8 pointstyle;
TQFont font;
TQPen pen;
TQBrush brush;
@@ -556,19 +556,19 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
};
case G_CIRCLEINTERIOR:
{
- notSupported( file, i18n( "This KSeg file tqcontains a filled circle, "
+ notSupported( file, i18n( "This KSeg file contains a filled circle, "
"which Kig does not currently support." ) );
return false;
};
case G_ARCSECTOR:
{
- notSupported( file, i18n( "This KSeg file tqcontains an arc sector, "
+ notSupported( file, i18n( "This KSeg file contains an arc sector, "
"which Kig does not currently support." ) );
return false;
};
case G_ARCSEGMENT:
{
- notSupported( file, i18n( "This KSeg file tqcontains an arc segment, "
+ notSupported( file, i18n( "This KSeg file contains an arc segment, "
"which Kig does not currently support." ) );
return false;
};
@@ -636,7 +636,7 @@ KigDocument* KigFilterKSeg::load( const TQString& file )
std::vector<ObjectCalcer*> args2;
args2.push_back( object->nameCalcer() );
ObjectCalcer* oc2 = fact->attachedLabelCalcer(
- TQString::tqfromLatin1( "%1" ), object->calcer(),
+ TQString::fromLatin1( "%1" ), object->calcer(),
static_cast<const PointImp*>( object->imp() )->coordinate(),
false, args2, *retdoc );
oc2->calc( *retdoc );
diff --git a/kig/filters/latexexporter.cc b/kig/filters/latexexporter.cc
index ce713771..98d3fc2e 100644
--- a/kig/filters/latexexporter.cc
+++ b/kig/filters/latexexporter.cc
@@ -194,7 +194,7 @@ void LatexExportImpVisitor::mapColor( TQColor color )
ColorMap newcolor;
newcolor.color = color;
TQString tmpname = color.name();
- tmpname.tqreplace( "#", "" );
+ tmpname.replace( "#", "" );
newcolor.name = tmpname;
mcolors.push_back( newcolor );
mstream << "\\newrgbcolor{" << tmpname << "}{"
diff --git a/kig/filters/latexexporteroptions.ui b/kig/filters/latexexporteroptions.ui
index e60614cd..d2e60c5b 100644
--- a/kig/filters/latexexporteroptions.ui
+++ b/kig/filters/latexexporteroptions.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>LatexExporterOptions</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -63,7 +63,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
</includehints>
</UI>
diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cc
index 2466d536..a5378263 100644
--- a/kig/filters/native-filter.cc
+++ b/kig/filters/native-filter.cc
@@ -140,7 +140,7 @@ KigDocument* KigFilterNative::load( const TQString& file )
TQStringList kigfiles = entries.grep( TQRegExp( "\\.kig$" ) );
if ( kigfiles.count() != 1 )
// I throw a generic parse error here, but I should warn the user that
- // this kig archive file doesn't contain one kig file (it tqcontains no
+ // this kig archive file doesn't contain one kig file (it contains no
// kig files or more than one).
KIG_FILTER_PARSE_ERROR;
const KArchiveEntry* kigz = dir->entry( kigfiles[0] );
@@ -642,7 +642,7 @@ bool KigFilterNative::save07( const KigDocument& kdoc, TQTextStream& stream )
TQDomElement drawelem = doc.createElement( "Draw" );
drawelem.setAttribute( "object", id );
drawelem.setAttribute( "color", d->color().name() );
- drawelem.setAttribute( "shown", TQString::tqfromLatin1( d->shown() ? "true" : "false" ) );
+ drawelem.setAttribute( "shown", TQString::fromLatin1( d->shown() ? "true" : "false" ) );
drawelem.setAttribute( "width", TQString::number( d->width() ) );
drawelem.setAttribute( "style", d->styleToString() );
drawelem.setAttribute( "point-style", d->pointStyleToString() );
diff --git a/kig/filters/svgexporteroptions.ui b/kig/filters/svgexporteroptions.ui
index 7b346459..2de679cb 100644
--- a/kig/filters/svgexporteroptions.ui
+++ b/kig/filters/svgexporteroptions.ui
@@ -4,7 +4,7 @@
<property name="name">
<cstring>SVGExporterOptions</cstring>
</property>
- <property name="tqgeometry">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
@@ -55,7 +55,7 @@
</widget>
<customwidgets>
</customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
<includehints>
</includehints>
</UI>
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-04 23:58:36 +0000