diff options
Diffstat (limited to 'kturtle')
-rw-r--r-- | kturtle/src/canvas.cpp | 4 | ||||
-rw-r--r-- | kturtle/src/canvas.h | 2 | ||||
-rw-r--r-- | kturtle/src/dialogs.cpp | 12 | ||||
-rw-r--r-- | kturtle/src/dialogs.h | 6 | ||||
-rw-r--r-- | kturtle/src/treenode.cpp | 24 | ||||
-rw-r--r-- | kturtle/src/treenode.h | 12 |
6 files changed, 30 insertions, 30 deletions
diff --git a/kturtle/src/canvas.cpp b/kturtle/src/canvas.cpp index e0a4ed05..c0b3910a 100644 --- a/kturtle/src/canvas.cpp +++ b/kturtle/src/canvas.cpp @@ -75,10 +75,10 @@ const double DEG2RAD = 3.14159265358979323846/180; // BEGIN public methods -Canvas::Canvas(TQWidget *tqparent, const char *name) : TQCanvasView(0, tqparent, name) +Canvas::Canvas(TQWidget *parent, const char *name) : TQCanvasView(0, parent, name) { // Create a new canvas for this view - canvas = new TQCanvas(TQT_TQOBJECT(tqparent)); + canvas = new TQCanvas(TQT_TQOBJECT(parent)); canvas->setAdvancePeriod(250); // refresh-rate in [ms] // set initial values diff --git a/kturtle/src/canvas.h b/kturtle/src/canvas.h index edda5f9d..76fde4d8 100644 --- a/kturtle/src/canvas.h +++ b/kturtle/src/canvas.h @@ -28,7 +28,7 @@ class Canvas : public TQCanvasView TQ_OBJECT public: - Canvas(TQWidget *tqparent = 0, const char *name = 0); + Canvas(TQWidget *parent = 0, const char *name = 0); ~Canvas(); TQPixmap* canvas2Pixmap(); diff --git a/kturtle/src/dialogs.cpp b/kturtle/src/dialogs.cpp index 9b693c1d..315c1f84 100644 --- a/kturtle/src/dialogs.cpp +++ b/kturtle/src/dialogs.cpp @@ -25,8 +25,8 @@ // BEGIN class ErrorMessage dialog -ErrorMessage::ErrorMessage (TQWidget *tqparent) - : KDialogBase (tqparent, "errorDialog", false, 0, KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true, i18n("Help on &Error") ) +ErrorMessage::ErrorMessage (TQWidget *parent) + : KDialogBase (parent, "errorDialog", false, 0, KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true, i18n("Help on &Error") ) { connect( this, TQT_SIGNAL( user1Clicked() ), this, TQT_SLOT( showHelpOnError() ) ); connect( this, TQT_SIGNAL( helpClicked() ), this, TQT_SLOT( errorMessageHelp() ) ); @@ -140,8 +140,8 @@ void ErrorMessage::errorMessageHelp() // BEGIN class ColorPicker dialog -ColorPicker::ColorPicker(TQWidget *tqparent) - : KDialogBase(tqparent, "colorpicker", false, i18n("Color Picker"), KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true ) +ColorPicker::ColorPicker(TQWidget *parent) + : KDialogBase(parent, "colorpicker", false, i18n("Color Picker"), KDialogBase::Close | KDialogBase::Help | KDialogBase::User1, KDialogBase::Close, true ) { // connect to help connect( this, TQT_SIGNAL( helpClicked() ), TQT_SLOT( slotColorPickerHelp() ) ); @@ -297,8 +297,8 @@ void ColorPicker::slotColorPickerHelp() // BEGIN class RestartOrBack dialog -RestartOrBack::RestartOrBack (TQWidget *tqparent) - : KDialogBase (tqparent, "rbDialog", true, 0, KDialogBase::User1 | KDialogBase::User2, KDialogBase::User2, false, i18n("&Restart"), i18n("&Back") ) +RestartOrBack::RestartOrBack (TQWidget *parent) + : KDialogBase (parent, "rbDialog", true, 0, KDialogBase::User1 | KDialogBase::User2, KDialogBase::User2, false, i18n("&Restart"), i18n("&Back") ) { setPlainCaption( i18n("Finished Execution") ); setButtonWhatsThis( KDialogBase::User1, i18n("Click here to restart the current logo program.") ); diff --git a/kturtle/src/dialogs.h b/kturtle/src/dialogs.h index f1b99a98..4cd69d1a 100644 --- a/kturtle/src/dialogs.h +++ b/kturtle/src/dialogs.h @@ -56,7 +56,7 @@ class ErrorMessage : public KDialogBase TQ_OBJECT public: - ErrorMessage(TQWidget *tqparent); + ErrorMessage(TQWidget *parent); ~ErrorMessage() {} bool containsErrors(); @@ -101,7 +101,7 @@ class ColorPicker : public KDialogBase TQ_OBJECT public: - ColorPicker(TQWidget *tqparent); + ColorPicker(TQWidget *parent); virtual ~ColorPicker() {} @@ -154,7 +154,7 @@ class RestartOrBack : public KDialogBase TQ_OBJECT public: - RestartOrBack (TQWidget *tqparent); + RestartOrBack (TQWidget *parent); ~RestartOrBack() {} protected: diff --git a/kturtle/src/treenode.cpp b/kturtle/src/treenode.cpp index f294a8a8..0579af7e 100644 --- a/kturtle/src/treenode.cpp +++ b/kturtle/src/treenode.cpp @@ -58,7 +58,7 @@ TreeNode::~TreeNode() void TreeNode::init() { clear(); - tqparent = NULL; + parent = NULL; // fTok.look (TQString) and fTok.value (Value) are properly init'ed when constructed fTok.start.row = 0; fTok.start.col = 0; @@ -77,23 +77,23 @@ void TreeNode::appendChild(TreeNode* node) void TreeNode::appendSibling(TreeNode* node) { - node->tqparent = tqparent; - if (tqparent != NULL) tqparent->push_back(node); + node->parent = parent; + if (parent != NULL) parent->push_back(node); } TreeNode* TreeNode::nextSibling() { - if (tqparent) + if (parent) { TreeNode::iterator i = lookup(); - if ( i != tqparent->end() ) + if ( i != parent->end() ) { ++i; // Must check after i has been incremented // to make sure i isn't at the end before // returning the contained pointer value. - if ( i != tqparent->end() ) return *i; + if ( i != parent->end() ) return *i; } } return NULL; @@ -101,13 +101,13 @@ TreeNode* TreeNode::nextSibling() TreeNode* TreeNode::prevSibling() { - if (tqparent) + if (parent) { TreeNode::iterator i = lookup(); // Must make sure we aren't at beginning as well // or we can crash when decrementing since we shouldn't // decrement before the start of the list. - if ( ( i != tqparent->end() ) && ( i != tqparent->begin() ) ) + if ( ( i != parent->end() ) && ( i != parent->begin() ) ) { --i; return *i; @@ -184,10 +184,10 @@ TreeNode* TreeNode::lastChild() TreeNode::iterator TreeNode::lookup() { - if (tqparent != NULL) + if (parent != NULL) { - TreeNode::iterator i = tqparent->begin(); - while ( (*i != this) && (i != tqparent->end() ) ) ++i; + TreeNode::iterator i = parent->begin(); + while ( (*i != this) && (i != parent->end() ) ) ++i; return i; } return end(); @@ -201,7 +201,7 @@ TreeNode& TreeNode::operator= (const TreeNode& t) { fType = t.fType; fTok = t.fTok; - tqparent = t.tqparent; + parent = t.parent; clear(); for (TreeNode::const_iterator i = t.begin(); i != t.end(); ++i) diff --git a/kturtle/src/treenode.h b/kturtle/src/treenode.h index 95b15bd8..f43260bf 100644 --- a/kturtle/src/treenode.h +++ b/kturtle/src/treenode.h @@ -213,14 +213,14 @@ class TreeNode : public list<TreeNode*> /*, public Value <-- maybe oneday */ { public: TreeNode(); // used for creation of the first node called 'tree', in the contructor of the parser - TreeNode( TreeNode* ); // give tqparent + TreeNode( TreeNode* ); // give parent TreeNode( Token, NodeType = Unknown, TQString = TQString() ); virtual ~TreeNode(); void init(); void appendChild(TreeNode*); - void appendSibling(TreeNode*); // works only if it has tqparent set! + void appendSibling(TreeNode*); // works only if it has parent set! TreeNode* firstChild(); TreeNode* secondChild(); @@ -232,8 +232,8 @@ class TreeNode : public list<TreeNode*> /*, public Value <-- maybe oneday */ TreeNode* nextSibling(); TreeNode* prevSibling(); - void setParent(TreeNode* p) { tqparent = p; } - TreeNode* getParent() const { return tqparent; } + void setParent(TreeNode* p) { parent = p; } + TreeNode* getParent() const { return parent; } void setToken(Token t) { fTok = t; } Token& getToken() { return fTok; } @@ -254,7 +254,7 @@ class TreeNode : public list<TreeNode*> /*, public Value <-- maybe oneday */ uint getCol() const { return fTok.start.col; } bool hasChildren() const { return size() != 0; } - TreeNode::iterator lookup(); // gives location in tqparent list as iterator (used by prevSibling and nextSibling) + TreeNode::iterator lookup(); // gives location in parent list as iterator (used by prevSibling and nextSibling) TreeNode& operator=(const TreeNode&); @@ -270,7 +270,7 @@ class TreeNode : public list<TreeNode*> /*, public Value <-- maybe oneday */ protected: - TreeNode *tqparent; + TreeNode *parent; }; #endif // _TREENODE_H_ |