Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1212480 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 19 insertions, 19 deletions

diff --git a/kdm/kfrontend/themer/kdmitem.h b/kdm/kfrontend/themer/kdmitem.h
index 975033b33..230ed71c4 100644
--- a/kdm/kfrontend/themer/kdmitem.h
+++ b/kdm/kfrontend/themer/kdmitem.h
@@ -52,14 +52,14 @@ class TQLayoutItem;
  */
 
 /**
- * A note on tqlayouting - how does it work?
- *  - settqgeometry is called by parent (passing the new tqgeometry)
- *    - item changes its tqgeometry
+ * A note on layouting - how does it work?
+ *  - setgeometry is called by parent (passing the new geometry)
+ *    - item changes its geometry
  *    - if item embeds a widget, reposition it too
  *    - call children's box manager. box->update( my geom )
  *      - sum up the whole space taken by children (via *hint calls) if
  *        needed for box width / height computation. note that the computed
- *        tqgeometry should be equal or similar to parent's tqgeometry.
+ *        geometry should be equal or similar to parent's geometry.
  *      - pad the rectangle bounding box' contents
  *      - for every child
  *        - if vertical
@@ -74,7 +74,7 @@ class TQLayoutItem;
  *            and insertion entry points are vertical lines
  *    - call to children's fix manager. fixed->update( my geom )
  *      - for every child
- *          - S = get child's tqgeometry hint (and we'll give item the whole
+ *          - S = get child's geometry hint (and we'll give item the whole
  *            space it needs, without constraints)
  *          - call to child->setGeometry( S )
  *    - TODO: send a selective redraw signal also merging children's areas
@@ -95,8 +95,8 @@ public:
 	virtual ~KdmItem();
 
 	/**
-	 * Fixup the tqgeometry of an item and its children (even if fixed
-	 * or boxed ones). Note that this will generate tqrepaint signals
+	 * Fixup the geometry of an item and its children (even if fixed
+	 * or boxed ones). Note that this will generate repaint signals
 	 * when needed. The default implementation should fit all needs.
 	 */
 	virtual void setGeometry( const TQRect &newGeometry, bool force );
@@ -109,7 +109,7 @@ public:
 	void paint( TQPainter *painter, const TQRect &boundaries );
 
 	/**
-	 * Update representation of contents and tqrepaint.
+	 * Update representation of contents and repaint.
 	 */
 	virtual void update();
 
@@ -120,22 +120,22 @@ public:
 	void mouseEvent( int x, int y, bool pressed = false, bool released = false );
 
 	/**
-	 * Similar to tqsizeHint(..), this returns the area of the item
+	 * Similar to sizeHint(..), this returns the area of the item
 	 * given the @p parentGeometry. The default implementation
-	 * takes into account geometric constraints and tqlayoutings.
-	 * @param parentGeometry the tqgeometry of the caller item or a
-	 * null rect if the tqgeometry of the parent is not yet defined.
+	 * takes into account geometric constraints and layoutings.
+	 * @param parentGeometry the geometry of the caller item or a
+	 * null rect if the geometry of the parent is not yet defined.
 	 */
 	virtual TQRect placementHint( const TQRect &parentGeometry );
 
 	/**
-	 * Create the box tqlayout manager; next children will be
-	 * managed by the box tqlayouter
+	 * Create the box layout manager; next children will be
+	 * managed by the box layouter
 	 */
 	void setBoxLayout( const TQDomNode &node = TQDomNode() );
 
 	/**
-	 * Create the fixed tqlayout manager; next children will be
+	 * Create the fixed layout manager; next children will be
 	 * in fixed position relative to this item
 	 */
 	void setFixedLayout( const TQDomNode &node = TQDomNode() );
@@ -163,7 +163,7 @@ public:
 	bool isExplicitlyHidden() const { return isShown == ExplicitlyHidden; }
 	TQRect rect() const { return area; }
 
-	TQWidget *tqparentWidget() const;
+	TQWidget *parentWidget() const;
 	TQString getId() const { return id; }
 
 signals:
@@ -172,7 +172,7 @@ signals:
 
 protected slots:
 	void widgetGone();
-	void tqlayoutItemGone();
+	void layoutItemGone();
 
 protected:
 	/**
@@ -181,7 +181,7 @@ protected:
 	 * @return (-1,-1) if no size can be determined (so it should
 	 * default to parent's size).
 	 */
-	virtual TQSize tqsizeHint();
+	virtual TQSize sizeHint();
 
 	/**
 	 * Low level graphical function to paint the item.
@@ -195,7 +195,7 @@ protected:
 
 	/**
 	 * Called when item changes its 'state' variable. This must
-	 * handle item's tqrepaint.
+	 * handle item's repaint.
 	 */
 	virtual void statusChanged();