summaryrefslogtreecommitdiffstats
path: root/karbon
diff options
context:
space:
mode:
Diffstat (limited to 'karbon')
-rw-r--r--karbon/commands/vdeletenodescmd.cc2
-rw-r--r--karbon/commands/vtransformcmd.cc8
-rw-r--r--karbon/commands/vungroupcmd.cc2
-rw-r--r--karbon/core/vgroup.cc8
-rw-r--r--karbon/core/vobject.cc6
-rw-r--r--karbon/core/vobject.h4
-rw-r--r--karbon/core/vobject_iface.h2
-rw-r--r--karbon/core/vpath.cc10
-rw-r--r--karbon/core/vselection.cc12
-rw-r--r--karbon/core/vstroke.cc4
-rw-r--r--karbon/dockers/vdocumentdocker.cc2
-rw-r--r--karbon/karbon_factory.cc6
-rw-r--r--karbon/karbon_factory.h2
-rw-r--r--karbon/karbon_part.cc12
-rw-r--r--karbon/karbon_part.h4
-rw-r--r--karbon/plugins/roundcorners/roundcornersplugin.cc2
-rw-r--r--karbon/plugins/whirlpinch/whirlpinchplugin.cc2
-rw-r--r--karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c16
-rw-r--r--karbon/render/xrgbrender/gdk-pixbuf-xlib.h2
-rw-r--r--karbon/render/xrgbrender/gdk-pixbuf-xlibrgb.c2
20 files changed, 54 insertions, 54 deletions
diff --git a/karbon/commands/vdeletenodescmd.cc b/karbon/commands/vdeletenodescmd.cc
index c16ac497..d1f7c979 100644
--- a/karbon/commands/vdeletenodescmd.cc
+++ b/karbon/commands/vdeletenodescmd.cc
@@ -52,7 +52,7 @@ VDeleteNodeCmd::visitVSubpath( VSubpath& path )
segment = segment->next();
}
if( m_segments.count() > 0 )
- path.tqinvalidateBoundingBox();
+ path.invalidateBoundingBox();
}
void
diff --git a/karbon/commands/vtransformcmd.cc b/karbon/commands/vtransformcmd.cc
index 5cb08953..f0173920 100644
--- a/karbon/commands/vtransformcmd.cc
+++ b/karbon/commands/vtransformcmd.cc
@@ -195,7 +195,7 @@ VTransformCmd::visitVSubpath( VSubpath& path )
segment = segment->next();
}
- path.tqinvalidateBoundingBox();
+ path.invalidateBoundingBox();
}
void
@@ -217,7 +217,7 @@ VTransformCmd::visitVText( VText& text )
visit( *itr.current() );
}
- text.tqinvalidateBoundingBox();
+ text.invalidateBoundingBox();
}
void
@@ -343,7 +343,7 @@ VTranslateBezierCmd::execute()
}
if( m_subpath )
- m_subpath->tqinvalidateBoundingBox();
+ m_subpath->invalidateBoundingBox();
setSuccess( true );
}
@@ -487,5 +487,5 @@ VTranslatePointCmd::translatePoints()
// tqinvalidate all changed subpaths
VObjectListIterator itr( m_subpaths );
for( ; itr.current(); ++itr )
- itr.current()->tqinvalidateBoundingBox();
+ itr.current()->invalidateBoundingBox();
}
diff --git a/karbon/commands/vungroupcmd.cc b/karbon/commands/vungroupcmd.cc
index 5f238898..e1e00531 100644
--- a/karbon/commands/vungroupcmd.cc
+++ b/karbon/commands/vungroupcmd.cc
@@ -64,7 +64,7 @@ VUnGroupCmd::execute()
for ( ; itr.current() ; ++itr )
{
- itr.current()->tqinvalidateBoundingBox();
+ itr.current()->invalidateBoundingBox();
tqparent->append( itr.current() );
}
diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cc
index 8a426577..ab2ec328 100644
--- a/karbon/core/vgroup.cc
+++ b/karbon/core/vgroup.cc
@@ -365,7 +365,7 @@ VGroup::take( const VObject& object )
{
m_objects.removeRef( &object );
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
void
@@ -375,7 +375,7 @@ VGroup::append( VObject* object )
m_objects.append( object );
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
void
@@ -385,7 +385,7 @@ VGroup::insertInfrontOf( VObject* newObject, VObject* oldObject )
m_objects.insert( m_objects.tqfind( oldObject ), newObject );
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
void
@@ -393,6 +393,6 @@ VGroup::clear()
{
m_objects.clear();
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
diff --git a/karbon/core/vobject.cc b/karbon/core/vobject.cc
index 2f9333ac..5e9f74b6 100644
--- a/karbon/core/vobject.cc
+++ b/karbon/core/vobject.cc
@@ -41,7 +41,7 @@ VObject::VObject( VObject* tqparent, VState state ) : m_dcop( 0L )
m_parent = tqparent;
m_state = state;
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
VObject::VObject( const VObject& obj )
@@ -52,7 +52,7 @@ VObject::VObject( const VObject& obj )
m_parent = obj.m_parent;
m_state = obj.m_state;
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
m_dcop = 0L;
VDocument *srcDoc = obj.document();
@@ -205,7 +205,7 @@ VObject::addStyles( const TQDomElement* style, KoOasisLoadingContext & context )
{
if(style)
{
- // this function is necessary as tqparent styles can have tqparents themself
+ // this function is necessary as tqparent styles can have parents themself
if( style->hasAttributeNS( KoXmlNS::style, "tqparent-style-name" ) )
addStyles( context.oasisStyles().findStyle( style->attributeNS( KoXmlNS::style, "tqparent-style-name", TQString() ) ), context );
context.addStyles( style, "style-name" );
diff --git a/karbon/core/vobject.h b/karbon/core/vobject.h
index 93a3ab1f..7cbbb0e9 100644
--- a/karbon/core/vobject.h
+++ b/karbon/core/vobject.h
@@ -124,12 +124,12 @@ public:
* This function is public so visitors can access it themself at the right
* time when they manipulate many VSegments.
*/
- void tqinvalidateBoundingBox()
+ void invalidateBoundingBox()
{
m_boundingBoxIsInvalid = true;
if( m_parent )
- m_parent->tqinvalidateBoundingBox();
+ m_parent->invalidateBoundingBox();
}
/**
diff --git a/karbon/core/vobject_iface.h b/karbon/core/vobject_iface.h
index e4a645ca..e3a081d3 100644
--- a/karbon/core/vobject_iface.h
+++ b/karbon/core/vobject_iface.h
@@ -44,7 +44,7 @@ k_dcop:
const KoRect& boundingBox() const { return m_boundingBox; }
bool boundingBoxIsInvalid() const;
- void tqinvalidateBoundingBox();
+ void invalidateBoundingBox();
void setParent( VObject* tqparent ) { m_parent = tqparent; }*/
DCOPRef tqparent() const;
diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cc
index 88baa8fe..a198eb52 100644
--- a/karbon/core/vpath.cc
+++ b/karbon/core/vpath.cc
@@ -820,7 +820,7 @@ VSubpath::insert( const VSegment* segment )
m_current = s;
++m_number;
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
return true;
}
@@ -856,7 +856,7 @@ VSubpath::insert( uint index, const VSegment* segment )
m_current = s;
++m_number;
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
return true;
}
@@ -878,7 +878,7 @@ VSubpath::prepend( const VSegment* segment )
++m_number;
m_currentIndex = 0;
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
void
@@ -898,7 +898,7 @@ VSubpath::append( const VSegment* segment )
m_currentIndex = m_number;
++m_number;
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
void
@@ -924,7 +924,7 @@ VSubpath::clear()
m_isClosed = false;
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
VSegment*
diff --git a/karbon/core/vselection.cc b/karbon/core/vselection.cc
index 30398ec4..b7cc2167 100644
--- a/karbon/core/vselection.cc
+++ b/karbon/core/vselection.cc
@@ -79,7 +79,7 @@ VSelection::take( VObject& object )
m_objects.removeRef( &object );
if( object.state() >= selected )
object.setState( normal );
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
bool
@@ -112,7 +112,7 @@ VSelection::take( const KoRect& rect, bool selectObjects, bool exclusive )
}
}
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
return success;
}
@@ -126,7 +126,7 @@ VSelection::append()
op.visit( *static_cast<VDocument*>( tqparent() ) );
selectNodes();
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
void
@@ -138,7 +138,7 @@ VSelection::append( VObject* object )
if( ! m_objects.tqcontainsRef( object ) )
m_objects.append( object );
object->setState( selected );
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
}
@@ -186,7 +186,7 @@ VSelection::append( const KoRect& rect, bool selectObjects, bool exclusive )
take( *( jtr.current() ) );
}
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
return success;
}
@@ -206,7 +206,7 @@ VSelection::clear()
}
m_objects.clear();
- tqinvalidateBoundingBox();
+ invalidateBoundingBox();
}
void
diff --git a/karbon/core/vstroke.cc b/karbon/core/vstroke.cc
index 0fe49e99..043f4e27 100644
--- a/karbon/core/vstroke.cc
+++ b/karbon/core/vstroke.cc
@@ -69,7 +69,7 @@ VStroke::setLineWidth( float width )
// tell our tqparent so he can update his bbox:
if( m_parent )
- m_parent->tqinvalidateBoundingBox();
+ m_parent->invalidateBoundingBox();
}
void
@@ -241,7 +241,7 @@ VStroke::operator=( const VStroke& stroke )
m_lineWidth = stroke.m_lineWidth;
// Tell our tqparent about the linewidth change, so he can update his bbox:
//if( m_parent )
- // m_parent->tqinvalidateBoundingBox();
+ // m_parent->invalidateBoundingBox();
m_lineCap = stroke.m_lineCap;
m_lineJoin = stroke.m_lineJoin;
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 84ed5200..a0cba13b 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -1005,7 +1005,7 @@ VLayersTab::removeDeletedObjectsFromList()
// iterate over all object items and delete the following items:
// - items representing deleted objects
- // - items with objects objects that changed tqparents
+ // - items with objects objects that changed parents
// BEWARE: when deleting an item, the iterator is automatically incremented
for(; it.current(); )
{
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index d8356184..041de7ff 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -76,7 +76,7 @@ KarbonFactory::~KarbonFactory()
}
KParts::Part*
-KarbonFactory::createPartObject( TQWidget* tqparentWidget, const char* widgetName,
+KarbonFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
TQObject* tqparent, const char* name, const char* classname, const TQStringList& )
{
// If classname is "KoDocument", our host is a koffice application
@@ -84,10 +84,10 @@ KarbonFactory::createPartObject( TQWidget* tqparentWidget, const char* widgetNam
// single view.
bool bWantKoDocument = ( strcmp( classname, "KoDocument" ) == 0 );
- // tqparentWidget and widgetName are used by KoDocument for the
+ // parentWidget and widgetName are used by KoDocument for the
// "readonly+singleView" case.
KarbonPart* part =
- new KarbonPart( tqparentWidget, widgetName, tqparent, name, !bWantKoDocument );
+ new KarbonPart( parentWidget, widgetName, tqparent, name, !bWantKoDocument );
if( !bWantKoDocument )
part->setReadWrite( false );
diff --git a/karbon/karbon_factory.h b/karbon/karbon_factory.h
index 308bc603..436faa2c 100644
--- a/karbon/karbon_factory.h
+++ b/karbon/karbon_factory.h
@@ -37,7 +37,7 @@ public:
KarbonFactory( TQObject* tqparent = 0, const char* name = 0 );
~KarbonFactory();
- virtual KParts::Part* createPartObject( TQWidget *tqparentWidget = 0,
+ virtual KParts::Part* createPartObject( TQWidget *parentWidget = 0,
const char* widgetName = 0L, TQObject* tqparent = 0L, const char* name = 0L,
const char* classname = "KoDocument", const TQStringList& args = TQStringList() );
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 90f10117..7aa145d3 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -57,9 +57,9 @@
// Make sure an appropriate DTD is available in www/koffice/DTD if changing this value
// static const char * CURRENT_DTD_VERSION = "1.2";
-KarbonPart::KarbonPart( TQWidget* tqparentWidget, const char* widgetName,
+KarbonPart::KarbonPart( TQWidget* parentWidget, const char* widgetName,
TQObject* tqparent, const char* name, bool singleViewMode )
- : KoDocument( tqparentWidget, widgetName, tqparent, name, singleViewMode )
+ : KoDocument( parentWidget, widgetName, tqparent, name, singleViewMode )
{
setInstance( KarbonFactory::instance(), false );
setTemplateType( "karbon_template" );
@@ -118,7 +118,7 @@ KarbonPart::setPageLayout( KoPageLayout& tqlayout, KoUnit::Unit _unit )
}
bool
-KarbonPart::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
+KarbonPart::initDoc(InitDocFlags flags, TQWidget* parentWidget)
{
if (flags==KoDocument::InitDocEmpty)
{
@@ -133,7 +133,7 @@ KarbonPart::initDoc(InitDocFlags flags, TQWidget* tqparentWidget)
else
dlgtype = KoTemplateChooseDia::OnlyTemplates;
- result = KoTemplateChooseDia::choose( KarbonFactory::instance(), file, dlgtype, "karbon_template", tqparentWidget );
+ result = KoTemplateChooseDia::choose( KarbonFactory::instance(), file, dlgtype, "karbon_template", parentWidget );
if( result == KoTemplateChooseDia::Template )
{
@@ -369,9 +369,9 @@ KarbonPart::saveOasis( KoStore *store, KoXmlWriter *manifestWriter )
KoGenStyles mainStyles;
KoGenStyle pageLayout = m_pageLayout.saveOasis();
- TQString tqlayoutName = mainStyles.lookup( pageLayout, "PL" );
+ TQString layoutName = mainStyles.lookup( pageLayout, "PL" );
KoGenStyle masterPage( KoGenStyle::STYLE_MASTER );
- masterPage.addAttribute( "style:page-tqlayout-name", tqlayoutName );
+ masterPage.addAttribute( "style:page-tqlayout-name", layoutName );
mainStyles.lookup( masterPage, "Default", KoGenStyles::DontForceNumbering );
KTempFile contentTmpFile;
diff --git a/karbon/karbon_part.h b/karbon/karbon_part.h
index 85e9902f..762f9985 100644
--- a/karbon/karbon_part.h
+++ b/karbon/karbon_part.h
@@ -47,7 +47,7 @@ class KARBONCOMMON_EXPORT KarbonPart : public KoDocument
Q_OBJECT
TQ_OBJECT
public:
- KarbonPart( TQWidget* tqparentWidget = 0L, const char* widgetName = 0L,
+ KarbonPart( TQWidget* parentWidget = 0L, const char* widgetName = 0L,
TQObject* tqparent = 0L, const char* name = 0L, bool singleViewMode = false );
virtual ~KarbonPart();
@@ -55,7 +55,7 @@ public:
bool transparent = false, double zoomX = 1.0, double zoomY = 1.0 );
/// standard koDocument inherited methods
- virtual bool initDoc(InitDocFlags flags, TQWidget* tqparentWidget=0);
+ virtual bool initDoc(InitDocFlags flags, TQWidget* parentWidget=0);
/// file-> open calls this method
virtual bool loadXML( TQIODevice*, const TQDomDocument& document );
diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cc b/karbon/plugins/roundcorners/roundcornersplugin.cc
index 7e18fb12..39739e68 100644
--- a/karbon/plugins/roundcorners/roundcornersplugin.cc
+++ b/karbon/plugins/roundcorners/roundcornersplugin.cc
@@ -395,7 +395,7 @@ VRoundCornersCmd::visitVSubpath( VSubpath& path )
path = newPath;
// Invalidate bounding box once.
- path.tqinvalidateBoundingBox();
+ path.invalidateBoundingBox();
}
#include "roundcornersplugin.moc"
diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cc b/karbon/plugins/whirlpinch/whirlpinchplugin.cc
index 6795f9d6..9ad72ed5 100644
--- a/karbon/plugins/whirlpinch/whirlpinchplugin.cc
+++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cc
@@ -192,7 +192,7 @@ VWhirlPinchCmd::visitVSubpath( VSubpath& path )
}
// Invalidate bounding box once.
- path.tqinvalidateBoundingBox();
+ path.invalidateBoundingBox();
}
#include "whirlpinchplugin.moc"
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c b/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
index f8f890e3..be1a839c 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib-render.c
@@ -320,23 +320,23 @@ gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf, Drawable drawable,
* @pixbuf: A pixbuf.
* @pixmap_return: Return value for the created pixmap.
- * @tqmask_return: Return value for the created tqmask.
+ * @mask_return: Return value for the created tqmask.
* @alpha_threshold: Threshold value for opacity values.
*
* Creates a pixmap and a tqmask bitmap which are returned in the @pixmap_return
- * and @tqmask_return arguments, respectively, and renders a pixbuf and its
+ * and @mask_return arguments, respectively, and renders a pixbuf and its
* corresponding tresholded alpha tqmask to them. This is merely a convenience
* function; applications that need to render pixbufs with dither offsets or to
* given drawables should use gdk_pixbuf_xlib_render_to_drawable_alpha() or
* gdk_pixbuf_xlib_render_to_drawable(), and
* gdk_pixbuf_xlib_render_threshold_alpha().
*
- * If the pixbuf does not have an alpha channel, then *@tqmask_return will be set
+ * If the pixbuf does not have an alpha channel, then *@mask_return will be set
* to None.
void
gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
Pixmap *pixmap_return,
- Pixmap *tqmask_return,
+ Pixmap *mask_return,
int alpha_threshold)
{
g_return_if_fail (pixbuf != NULL);
@@ -361,20 +361,20 @@ gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
XFreeGC (gdk_pixbuf_dpy, gc);
}
- if (tqmask_return) {
+ if (mask_return) {
if (pixbuf->has_alpha) {
- *tqmask_return = XCreatePixmap (gdk_pixbuf_dpy,
+ *mask_return = XCreatePixmap (gdk_pixbuf_dpy,
RootWindow (gdk_pixbuf_dpy,
gdk_pixbuf_screen),
pixbuf->width,
pixbuf->height, 1);
gdk_pixbuf_xlib_render_threshold_alpha (pixbuf,
- *tqmask_return,
+ *mask_return,
0, 0, 0, 0,
pixbuf->width,
pixbuf->height,
alpha_threshold);
} else
- *tqmask_return = 0;
+ *mask_return = 0;
}
}*/
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlib.h b/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
index 26d2426a..63961ea7 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlib.h
@@ -65,7 +65,7 @@ void gdk_pixbuf_xlib_render_to_drawable_alpha (GdkPixbuf *pixbuf,
void gdk_pixbuf_xlib_render_pixmap_and_tqmask (GdkPixbuf *pixbuf,
Pixmap *pixmap_return,
- Pixmap *tqmask_return,
+ Pixmap *mask_return,
int alpha_threshold);
diff --git a/karbon/render/xrgbrender/gdk-pixbuf-xlibrgb.c b/karbon/render/xrgbrender/gdk-pixbuf-xlibrgb.c
index 5c6c6ae0..171db33d 100644
--- a/karbon/render/xrgbrender/gdk-pixbuf-xlibrgb.c
+++ b/karbon/render/xrgbrender/gdk-pixbuf-xlibrgb.c
@@ -930,7 +930,7 @@ xlib_rgb_init_with_depth (Display *display, Screen *screen, int prefDepth)
static_image[i]->byte_order = MSBFirst;
}
}
- /* ok, so aptqparently, image_info->bpp is actually
+ /* ok, so apparently, image_info->bpp is actually
BYTES per pixel. What fun! */
switch (static_image[0]->bits_per_pixel) {
case 1:
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-08 16:04:56 +0000