TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


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

1 files changed, 6 insertions, 5 deletions

diff --git a/ktouch/src/ktouchslideline.h b/ktouch/src/ktouchslideline.h
index b1466b7e..c707a9ad 100644
--- a/ktouch/src/ktouchslideline.h
+++ b/ktouch/src/ktouchslideline.h
@@ -33,9 +33,10 @@ class TQPainter;
 /// Please refer to the documentation 'sliding_line_widget.pdf' in the doc folder.
 class KTouchSlideLine : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
   public:
     /// Constructor
-    KTouchSlideLine(TQWidget *parent);
+    KTouchSlideLine(TQWidget *tqparent);
     /// Destructor, free memory allocated for the line pixmap.
     ~KTouchSlideLine();
     /// Applies the preferences (font and colours).
@@ -82,7 +83,7 @@ class KTouchSlideLine : public TQWidget {
 	/// @see slide()
     void paintEvent( TQPaintEvent * );
     /// Will be called when the widget is resized.
-    /// This event will first recalculate the geometry of the sliding lines.
+    /// This event will first recalculate the tqgeometry of the sliding lines.
 	/// Then the font size will be updated and through that, the sliding lines will be
 	/// updated.
     void resizeEvent ( TQResizeEvent * );
@@ -120,8 +121,8 @@ class KTouchSlideLine : public TQWidget {
     TQColor      m_cursorBackground; ///< Defines the background colour of the cursor (when turned off).
 
 	// variables depending on size of widget, will be updated in resizeEvent()
-	int			m_marginVerWidget;	///< Vertical margin between widget boundary and sliding line in pixels.
-	int			m_slideLineDist;	///< Vertical distance between sliding lines in pixels.
+	int			m_marginVerWidget;	///<Qt::Vertical margin between widget boundary and sliding line in pixels.
+	int			m_slideLineDist;	///<Qt::Vertical distance between sliding lines in pixels.
 	int			m_slideLineHeight;	///< Height of a sliding line in pixels.
 	int			m_marginCursor;		///< The margin for cursor movement (minimum distance from left and right ends of slide line boundaries).
 
@@ -132,7 +133,7 @@ class KTouchSlideLine : public TQWidget {
 	int			m_yCursorStudent;   ///< Cursor top y coordinate (from top of visible area) in the student line.
 
 	// newly defined variables, will be updated on the setNewText() and partially in setStudentText()
-	int			m_marginHorWidget;	///< Horizontal margin between widget boundary and sliding line in pixels.
+	int			m_marginHorWidget;	///<Qt::Horizontal margin between widget boundary and sliding line in pixels.
 	int			m_slideLineWidth;	///< The length of the sliding line in pixels.
     int			m_cursorRangeLen;	///< Length (in pixel) that the cursor can move between left and right margin.