diff options
152 files changed, 529 insertions, 529 deletions
diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 69a7809..6582364 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -50,16 +50,16 @@ extern "C" #include <X11/keysymdef.h> #include <X11/extensions/XKB.h> - KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kbstateapplet"); - KbStateApplet *applet = new KbStateApplet(configFile, KPanelApplet::Normal, KPanelApplet::About, tqparent, "kbstateapplet"); + KbStateApplet *applet = new KbStateApplet(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "kbstateapplet"); return applet; } } struct ModifierKey { - const unsigned int tqmask; + const unsigned int mask; const KeySym keysym; const char *name; const char *icon; @@ -86,8 +86,8 @@ static ModifierKey modifierKeys[] = { /********************************************************************/ KbStateApplet::KbStateApplet(const TQString& configFile, Type t, int actions, - TQWidget *tqparent, const char *name) - : KPanelApplet( configFile, t, actions, tqparent, name ) + TQWidget *parent, const char *name) + : KPanelApplet( configFile, t, actions, parent, name ) { for (int i = 0; i < 8; i++) { icons[i] = 0; @@ -527,21 +527,21 @@ void KbStateApplet::initMasks() { state = 0; for (int i = 0; strcmp(modifierKeys[i].name, "") != 0; i++) { - int tqmask = modifierKeys[i].tqmask; - if (tqmask == 0) + int mask = modifierKeys[i].mask; + if (mask == 0) if (modifierKeys[i].keysym != 0) - tqmask = XkbKeysymToModifiers (this->x11Display(), modifierKeys[i].keysym); + mask = XkbKeysymToModifiers (this->x11Display(), modifierKeys[i].keysym); else if (!strcmp(modifierKeys[i].name, "Win")) - tqmask = KKeyNative::modX(KKey::WIN); + mask = KKeyNative::modX(KKey::WIN); else - tqmask = XkbKeysymToModifiers (this->x11Display(), XK_Mode_switch) + mask = XkbKeysymToModifiers (this->x11Display(), XK_Mode_switch) | XkbKeysymToModifiers (this->x11Display(), XK_ISO_Level3_Shift) | XkbKeysymToModifiers (this->x11Display(), XK_ISO_Level3_Latch) | XkbKeysymToModifiers (this->x11Display(), XK_ISO_Level3_Lock); int map = 0; for (map = 0; map < 8; map++) { - if ((tqmask & (1 << map)) != 0) + if ((mask & (1 << map)) != 0) break; } if ((map <= 7) && !(icons[map])) { @@ -747,8 +747,8 @@ void KbStateApplet::saveConfig() /********************************************************************/ KeyIcon::KeyIcon (int keyId, KInstance *instance, - TQWidget *tqparent, const char *name) - : StatusIcon (modifierKeys[keyId].name, tqparent, name) { + TQWidget *parent, const char *name) + : StatusIcon (modifierKeys[keyId].name, parent, name) { this->instance = instance; this->keyId = keyId; this->tristate = (modifierKeys[keyId].isModifier); @@ -855,8 +855,8 @@ void KeyIcon::drawButton (TQPainter *p) { /********************************************************************/ -MouseIcon::MouseIcon (KInstance *instance, TQWidget *tqparent, const char *name) - : StatusIcon ("", tqparent, name) +MouseIcon::MouseIcon (KInstance *instance, TQWidget *parent, const char *name) + : StatusIcon ("", parent, name) { this->instance = instance; state = 0; @@ -958,8 +958,8 @@ void MouseIcon::drawButton (TQPainter *p) { TimeoutIcon::TimeoutIcon (KInstance *instance, const TQString &text, const TQString &featurename, - TQWidget *tqparent, const char *name) - : StatusIcon (text, tqparent, name) { + TQWidget *parent, const char *name) + : StatusIcon (text, parent, name) { this->instance = instance; this->featurename = featurename; glyth = " "; @@ -1066,8 +1066,8 @@ void TimeoutIcon::drawButton (TQPainter *p) { /********************************************************************/ -StatusIcon::StatusIcon (const TQString &text, TQWidget *tqparent, const char *name) - : TQPushButton (text, tqparent, name) { +StatusIcon::StatusIcon (const TQString &text, TQWidget *parent, const char *name) + : TQPushButton (text, parent, name) { tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored)); } diff --git a/kbstateapplet/kbstate.h b/kbstateapplet/kbstate.h index 55aca27..fc6987f 100644 --- a/kbstateapplet/kbstate.h +++ b/kbstateapplet/kbstate.h @@ -37,7 +37,7 @@ class StatusIcon : public TQPushButton { Q_OBJECT TQ_OBJECT public: - StatusIcon (const TQString &text, TQWidget *tqparent, const char *name=0); + StatusIcon (const TQString &text, TQWidget *parent, const char *name=0); ~StatusIcon (); TQSize tqminimumSizeHint () const; @@ -50,7 +50,7 @@ class TimeoutIcon : public StatusIcon { public: TimeoutIcon (KInstance *instance, const TQString &text, const TQString &featurename, - TQWidget *tqparent, const char *name=0); + TQWidget *parent, const char *name=0); ~TimeoutIcon (); void update (); @@ -77,7 +77,7 @@ class KeyIcon : public StatusIcon { TQ_OBJECT public: KeyIcon (int keyId, KInstance *instance, - TQWidget *tqparent, const char *name=0); + TQWidget *parent, const char *name=0); ~KeyIcon (); void setState (bool latched, bool locked); void drawButton (TQPainter *p); @@ -107,7 +107,7 @@ class MouseIcon : public StatusIcon { Q_OBJECT TQ_OBJECT public: - MouseIcon (KInstance *instance, TQWidget *tqparent, const char *name=0); + MouseIcon (KInstance *instance, TQWidget *parent, const char *name=0); ~MouseIcon (); void setState (int state); void setActiveKey (int activekey); @@ -138,7 +138,7 @@ class KbStateApplet : public KPanelApplet { public: KbStateApplet(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *tqparent = 0, const char *name = 0); + TQWidget *parent = 0, const char *name = 0); ~KbStateApplet(); int widthForHeight(int height) const; diff --git a/kmag/kmag.h b/kmag/kmag.h index e84a176..aeee22b 100644 --- a/kmag/kmag.h +++ b/kmag/kmag.h @@ -63,7 +63,7 @@ class KmagApp : public KMainWindow /** * Construtor of KmagApp, calls all init functions to create the application. */ - KmagApp(TQWidget* tqparent=0, const char* name=0); + KmagApp(TQWidget* parent=0, const char* name=0); /// Default destructor ~KmagApp(); diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp index 7a749cb..236bddf 100644 --- a/kmag/kmagselrect.cpp +++ b/kmag/kmagselrect.cpp @@ -87,42 +87,42 @@ int getTitleSize () // Construction //-------------------------------------------------------------------------- -KMagSelRect::KMagSelRect(TQWidget *tqparent) : +KMagSelRect::KMagSelRect(TQWidget *parent) : TQRect() { - init(tqparent); + init(parent); } KMagSelRect::KMagSelRect(const TQPoint &topLeft, const TQPoint &bottomRight, - TQWidget *tqparent) : + TQWidget *parent) : TQRect(topLeft, bottomRight) { - init(tqparent); + init(parent); } KMagSelRect::KMagSelRect(const TQPoint &topLeft, const TQSize &size, - TQWidget *tqparent) : + TQWidget *parent) : TQRect(topLeft, size) { - init(tqparent); + init(parent); } KMagSelRect::KMagSelRect(int left, int top, int width, int height, - TQWidget *tqparent) : + TQWidget *parent) : TQRect(left, top, width, height) { - init(tqparent); + init(parent); } -void KMagSelRect::init(TQWidget *tqparent) +void KMagSelRect::init(TQWidget *parent) { - // Make sure tqparent is the window itself, not a widget within the window - if (tqparent != 0) - while (tqparent->parentWidget (true) != 0) - tqparent=tqparent->parentWidget (true); + // Make sure parent is the window itself, not a widget within the window + if (parent != 0) + while (parent->parentWidget (true) != 0) + parent=parent->parentWidget (true); selectionwindow = 0; - selWindowParent = tqparent; + selWindowParent = parent; m_alwaysVisible = false; } @@ -215,8 +215,8 @@ void KMagSelRect::selWinResized() // KMagSelWin //-------------------------------------------------------------------------- -KMagSelWin::KMagSelWin ( TQWidget * tqparent, const char * name, WFlags ) : - TQWidget (tqparent, name, WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop | WType_TopLevel | WX11BypassWM) +KMagSelWin::KMagSelWin ( TQWidget * parent, const char * name, WFlags ) : + TQWidget (parent, name, WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop | WType_TopLevel | WX11BypassWM) { TQBitmap line (8, 8, line_bits, true); setPaletteBackgroundPixmap (line); @@ -356,8 +356,8 @@ void KMagSelWin::bottomRightResized ( TQPoint offset ) // KMagSelWinCorner //-------------------------------------------------------------------------- -KMagSelWinCorner::KMagSelWinCorner ( TQWidget * tqparent, const char * name, WFlags f ) : - TQLabel (tqparent, name, f) +KMagSelWinCorner::KMagSelWinCorner ( TQWidget * parent, const char * name, WFlags f ) : + TQLabel (parent, name, f) { setFrameStyle (TQFrame::WinPanel | TQFrame::Raised); setLineWidth (1); diff --git a/kmag/kmagselrect.h b/kmag/kmagselrect.h index 9180b36..ec3666b 100644 --- a/kmag/kmagselrect.h +++ b/kmag/kmagselrect.h @@ -34,7 +34,7 @@ class KMagSelWinCorner : public TQLabel public: - KMagSelWinCorner ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KMagSelWinCorner ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); virtual ~KMagSelWinCorner(); @@ -59,7 +59,7 @@ class KMagSelWin : public TQWidget public: - KMagSelWin ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); + KMagSelWin ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); virtual ~KMagSelWin(); @@ -103,11 +103,11 @@ class KMagSelRect : public TQObject, public TQRect TQ_OBJECT public: - KMagSelRect(TQWidget *tqparent=0); + KMagSelRect(TQWidget *parent=0); KMagSelRect(const TQPoint &topLeft, const TQPoint &bottomRight, - TQWidget *tqparent=0); + TQWidget *parent=0); KMagSelRect(const TQPoint &topLeft, const TQSize &size, - TQWidget *tqparent=0); + TQWidget *parent=0); KMagSelRect(int left, int top, int width, int height, TQWidget *selWindowParent=0); diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp index 6c3e8f1..f0f3715 100644 --- a/kmag/kmagzoomview.cpp +++ b/kmag/kmagzoomview.cpp @@ -80,12 +80,12 @@ static uchar phand_bits[] = { static bool obscuredRegion (TQRegion ®ion, Window winId, Window ignoreId, Window start = 0, int level = -1) { - Window root, tqparent, *tqchildren; uint ntqchildren; + Window root, parent, *tqchildren; uint ntqchildren; if (0 == start) start = qt_xrootwin(); bool winIdFound = false; - if (0 != XQueryTree (qt_xdisplay(), start, &root, &tqparent, &tqchildren, &ntqchildren)) { + if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &tqchildren, &ntqchildren)) { for (uint i=0; i < ntqchildren; ++i) { if (winIdFound) { if (ignoreId != tqchildren [i]) { @@ -120,8 +120,8 @@ static bool obscuredRegion (TQRegion ®ion, Window winId, Window ignoreId, Win -KMagZoomView::KMagZoomView(TQWidget *tqparent, const char *name) - : TQScrollView(tqparent, name), +KMagZoomView::KMagZoomView(TQWidget *parent, const char *name) + : TQScrollView(parent, name), m_selRect(0, 0, 128, 128, this), m_grabTimer(0), m_mouseViewTimer(0), @@ -295,8 +295,8 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos) pz.setBackgroundColor(TQt::white); TQBitmap sCursor( 16, 16, left_ptr_bits, TRUE ); - TQBitmap tqmask( 16, 16, left_ptrmsk_bits, TRUE ); - sCursor.setMask(tqmask); + TQBitmap mask( 16, 16, left_ptrmsk_bits, TRUE ); + sCursor.setMask(mask); // since hot spot is at 3,1 pz.drawPixmap(mousePos.x()-3, mousePos.y()-1, sCursor); @@ -319,8 +319,8 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos) pz.setBackgroundColor(TQt::white); TQBitmap sCursor( 16, 16, left_ptr_bits, TRUE ); - TQBitmap tqmask( 16, 16, left_ptrmsk_bits, TRUE ); - sCursor.setMask(tqmask); + TQBitmap mask( 16, 16, left_ptrmsk_bits, TRUE ); + sCursor.setMask(mask); // since hot spot is at 3,1 pz.drawPixmap(mousePos.x()-3, mousePos.y()-1, sCursor); @@ -328,8 +328,8 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos) break; default: TQBitmap sCursor( 32, 32, phand_bits, TRUE ); - TQBitmap tqmask( 32, 32, phandm_bits, TRUE ); - sCursor.setMask(tqmask); + TQBitmap mask( 32, 32, phandm_bits, TRUE ); + sCursor.setMask(mask); pz.drawPixmap(mousePos.x(), mousePos.y(), sCursor); break; @@ -392,7 +392,7 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e) m_selRect.show(); } else { - // ignore this button press.. so it goes to the tqparent + // ignore this button press.. so it goes to the parent e->ignore(); } } else if(m_shiftKeyPressed) { @@ -415,7 +415,7 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e) m_selRect.show(); } else { - // ignore this button press.. so it goes to the tqparent + // ignore this button press.. so it goes to the parent e->ignore(); } } else { @@ -437,7 +437,7 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e) m_selRect.show(); } else { - // ignore this button press.. so it goes to the tqparent + // ignore this button press.. so it goes to the parent e->ignore(); } } @@ -463,13 +463,13 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e) m_selRect.show(); } else { - // ignore this button press.. so it goes to the tqparent + // ignore this button press.. so it goes to the parent e->ignore(); } break; // do nothing default: - // ignore this button press.. so it goes to the tqparent + // ignore this button press.. so it goes to the parent e->ignore(); break; } diff --git a/kmag/kmagzoomview.h b/kmag/kmagzoomview.h index 5f88458..1f8d9bc 100644 --- a/kmag/kmagzoomview.h +++ b/kmag/kmagzoomview.h @@ -49,7 +49,7 @@ class KMagZoomView : public TQScrollView TQ_OBJECT public: /// Constructor for the main view - KMagZoomView(TQWidget *tqparent = 0, const char *name=0); + KMagZoomView(TQWidget *parent = 0, const char *name=0); /// Destructor for the main view ~KMagZoomView(); diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp index 3e03e23..e7744af 100644 --- a/kmousetool/kmousetool/kmousetool.cpp +++ b/kmousetool/kmousetool/kmousetool.cpp @@ -250,7 +250,7 @@ void KMouseTool::playTickSound() // TQSound::play(mSoundFileName); } -KMouseTool::KMouseTool(TQWidget *tqparent, const char *name) : KMouseToolUI(tqparent, name) +KMouseTool::KMouseTool(TQWidget *parent, const char *name) : KMouseToolUI(parent, name) { init_vars(); resetSettings(); @@ -608,7 +608,7 @@ void KMouseTool::aboutSelected() -KMouseToolTray::KMouseToolTray (TQWidget *tqparent, const char *name) : KSystemTray (tqparent, name) +KMouseToolTray::KMouseToolTray (TQWidget *parent, const char *name) : KSystemTray (parent, name) { startStopId = contextMenu()->insertItem (i18n("&Start"), this, TQT_SIGNAL(startStopSelected())); contextMenu()->insertSeparator(); diff --git a/kmousetool/kmousetool/kmousetool.h b/kmousetool/kmousetool/kmousetool.h index fde5566..5301e17 100644 --- a/kmousetool/kmousetool/kmousetool.h +++ b/kmousetool/kmousetool/kmousetool.h @@ -187,7 +187,7 @@ public: /** * construtor */ - KMouseTool(TQWidget* tqparent=0, const char *name=0); + KMouseTool(TQWidget* parent=0, const char *name=0); /** destructor */ ~KMouseTool(); @@ -198,7 +198,7 @@ class KMouseToolTray : public KSystemTray { TQ_OBJECT int startStopId; public: - KMouseToolTray (TQWidget *tqparent=0, const char *name=0); + KMouseToolTray (TQWidget *parent=0, const char *name=0); ~KMouseToolTray(); void updateStartStopText (bool mousetool_is_running); diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp index bce57e4..3ca0b5c 100644 --- a/kmouth/configwizard.cpp +++ b/kmouth/configwizard.cpp @@ -31,8 +31,8 @@ #include "wordcompletion/wordcompletion.h" #include "wordcompletion/dictionarycreationwizard.h" -ConfigWizard::ConfigWizard (TQWidget *tqparent, const char *name, KConfig *config) - : KWizard(tqparent, name, true) +ConfigWizard::ConfigWizard (TQWidget *parent, const char *name, KConfig *config) + : KWizard(parent, name, true) { setCaption (i18n("Initial Configuration - KMouth")); diff --git a/kmouth/configwizard.h b/kmouth/configwizard.h index 8f2dd55..9f3fff8 100644 --- a/kmouth/configwizard.h +++ b/kmouth/configwizard.h @@ -37,7 +37,7 @@ class ConfigWizard : public KWizard { Q_OBJECT TQ_OBJECT public: - ConfigWizard (TQWidget *tqparent, const char *name, KConfig *config); + ConfigWizard (TQWidget *parent, const char *name, KConfig *config); ~ConfigWizard(); bool configurationNeeded (); diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h index e9b18f4..fe610a6 100644 --- a/kmouth/kmouth.h +++ b/kmouth/kmouth.h @@ -61,7 +61,7 @@ class KMouthApp : public KMainWindow public: /** construtor of KMouthApp, calls all init functions to create the application. */ - KMouthApp(TQWidget* tqparent=0, const char* name=0); + KMouthApp(TQWidget* parent=0, const char* name=0); ~KMouthApp(); /** Returns true if the configuration wizard was not needed or when it * was successfully completed. diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp index ad98fda..a32eb6e 100644 --- a/kmouth/optionsdialog.cpp +++ b/kmouth/optionsdialog.cpp @@ -39,8 +39,8 @@ #include "texttospeechconfigurationwidget.h" #include "speech.h" -PreferencesWidget::PreferencesWidget (TQWidget *tqparent, const char *name) - : PreferencesUI (tqparent, name) +PreferencesWidget::PreferencesWidget (TQWidget *parent, const char *name) + : PreferencesUI (parent, name) { speakCombo->setCurrentItem (1); speak = false; @@ -113,9 +113,9 @@ bool PreferencesWidget::isSpeakImmediately () { /***************************************************************************/ -OptionsDialog::OptionsDialog (TQWidget *tqparent) +OptionsDialog::OptionsDialog (TQWidget *parent) : KDialogBase(IconList, i18n("Configuration"), Ok|Apply|Cancel|Help, Ok, - tqparent, "configuration", false, true) + parent, "configuration", false, true) { setHelp ("config-dialog"); diff --git a/kmouth/optionsdialog.h b/kmouth/optionsdialog.h index ac50f7d..a53d230 100644 --- a/kmouth/optionsdialog.h +++ b/kmouth/optionsdialog.h @@ -35,7 +35,7 @@ class PreferencesWidget : public PreferencesUI { Q_OBJECT TQ_OBJECT public: - PreferencesWidget(TQWidget *tqparent, const char *name); + PreferencesWidget(TQWidget *parent, const char *name); ~PreferencesWidget(); void readOptions (KConfig *config); @@ -59,7 +59,7 @@ class OptionsDialog : public KDialogBase { Q_OBJECT TQ_OBJECT public: - OptionsDialog(TQWidget *tqparent); + OptionsDialog(TQWidget *parent); ~OptionsDialog(); void slotCancel(); diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp index 7ff932b..2332ee6 100644 --- a/kmouth/phrasebook/phrasebook.cpp +++ b/kmouth/phrasebook/phrasebook.cpp @@ -249,7 +249,7 @@ bool PhraseBook::save (const KURL &url, bool asPhrasebook) { } } -int PhraseBook::save (TQWidget *tqparent, const TQString &title, KURL &url, bool phrasebookFirst) { +int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool phrasebookFirst) { // KFileDialog::getSaveURL(...) is not useful here as we need // to know the requested file type. @@ -259,7 +259,7 @@ int PhraseBook::save (TQWidget *tqparent, const TQString &title, KURL &url, bool else filters = i18n("*.txt|Plain Text Files (*.txt)\n*.phrasebook|Phrase Books (*.phrasebook)\n*|All Files"); - KFileDialog fdlg(TQString(),filters, tqparent, "filedialog", true); + KFileDialog fdlg(TQString(),filters, parent, "filedialog", true); fdlg.setCaption(title); fdlg.setOperationMode( KFileDialog::Saving ); @@ -374,7 +374,7 @@ void PhraseBook::addToGUI (TQPopupMenu *popup, KToolBar *toolbar, KActionCollect TQObject *receiver, const char *slot) const { if ((popup != 0) || (toolbar != 0)) { TQPtrStack<TQWidget> stack; - TQWidget *tqparent = popup; + TQWidget *parent = popup; int level = 0; TQValueListConstIterator<PhraseBookEntry> it; @@ -384,38 +384,38 @@ void PhraseBook::addToGUI (TQPopupMenu *popup, KToolBar *toolbar, KActionCollect KActionMenu *menu = new KActionMenu("", "phrasebook"); menu->setDelayed(false); phrases->insert(menu); - menu->plug (tqparent); - if (tqparent == popup) + menu->plug (parent); + if (parent == popup) menu->plug (toolbar); - if (tqparent != 0) - stack.push (tqparent); - tqparent = menu->popupMenu(); + if (parent != 0) + stack.push (parent); + parent = menu->popupMenu(); level++; } - while (newLevel < level && (tqparent != popup)) { - tqparent = stack.pop(); + while (newLevel < level && (parent != popup)) { + parent = stack.pop(); level--; } if ((*it).isPhrase()) { Phrase phrase = (*it).getPhrase(); KAction *action = new PhraseAction (phrase.getPhrase(), phrase.getShortcut(), receiver, slot, phrases); - if (tqparent == popup) + if (parent == popup) action->plug (toolbar); - if (tqparent != 0) - action->plug(tqparent); + if (parent != 0) + action->plug(parent); } else { Phrase phrase = (*it).getPhrase(); KActionMenu *menu = new KActionMenu(phrase.getPhrase(), "phrasebook"); menu->setDelayed(false); phrases->insert(menu); - if (tqparent == popup) + if (parent == popup) menu->plug (toolbar); - if (tqparent != 0) - menu->plug (tqparent); - stack.push (tqparent); - tqparent = menu->popupMenu(); + if (parent != 0) + menu->plug (parent); + stack.push (parent); + parent = menu->popupMenu(); level++; } } diff --git a/kmouth/phrasebook/phrasebook.h b/kmouth/phrasebook/phrasebook.h index eb19ea2..200bbae 100644 --- a/kmouth/phrasebook/phrasebook.h +++ b/kmouth/phrasebook/phrasebook.h @@ -118,7 +118,7 @@ public: * 0, if the user canceled the operation, * -1, if there was an error when saving the file. */ - int save (TQWidget *tqparent, const TQString &title, KURL &url, bool phrasebookFirst = true); + int save (TQWidget *parent, const TQString &title, KURL &url, bool phrasebookFirst = true); /** encodes the phrase book. Returns the encoded xml code. */ TQString encode (); @@ -173,8 +173,8 @@ class PhraseAction : public KAction { Q_OBJECT TQ_OBJECT public: - PhraseAction (const TQString& phrase, const TQString& cut, const TQObject* receiver, const char* slot, KActionCollection* tqparent) - : KAction (phrase, "phrase", KShortcut(cut), 0, 0, tqparent, phrase.latin1()) { + PhraseAction (const TQString& phrase, const TQString& cut, const TQObject* receiver, const char* slot, KActionCollection* parent) + : KAction (phrase, "phrase", KShortcut(cut), 0, 0, parent, phrase.latin1()) { this->phrase = phrase; connect (this, TQT_SIGNAL(slotActivated (const TQString &)), receiver, slot); }; diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp index dff69e8..3cfe25b 100644 --- a/kmouth/phrasebook/phrasebookdialog.cpp +++ b/kmouth/phrasebook/phrasebookdialog.cpp @@ -53,9 +53,9 @@ namespace PhraseBookPrivate { }; } -CheckBookItem::CheckBookItem (TQListViewItem *tqparent, TQListViewItem *last, +CheckBookItem::CheckBookItem (TQListViewItem *parent, TQListViewItem *last, const TQString &text, const TQString &name, const TQString &filename) - : TQCheckListItem (tqparent, text, TQCheckListItem::CheckBox) + : TQCheckListItem (parent, text, TQCheckListItem::CheckBox) { moveItem (last); setText(PhraseBookPrivate::name, name); @@ -67,12 +67,12 @@ CheckBookItem::CheckBookItem (TQListViewItem *tqparent, TQListViewItem *last, else numberOfBooks = 1; selectedBooks = 0; - ((CheckBookItem*)tqparent)->childChange (numberOfBooks, selectedBooks); + ((CheckBookItem*)parent)->childChange (numberOfBooks, selectedBooks); } -CheckBookItem::CheckBookItem (TQListView *tqparent, TQListViewItem *last, +CheckBookItem::CheckBookItem (TQListView *parent, TQListViewItem *last, const TQString &text, const TQString &name, const TQString &filename) - : TQCheckListItem (tqparent, text, TQCheckListItem::CheckBox) + : TQCheckListItem (parent, text, TQCheckListItem::CheckBox) { moveItem (last); setText(PhraseBookPrivate::name, name); @@ -102,12 +102,12 @@ void CheckBookItem::activate() { void CheckBookItem::stateChange (bool on) { TQListViewItem *item = firstChild(); if (item == 0) { - TQListViewItem *tqparent = this->tqparent(); - if (tqparent != 0) { + TQListViewItem *parent = this->parent(); + if (parent != 0) { if (on) - ((CheckBookItem*)tqparent)->childChange (0, 1); + ((CheckBookItem*)parent)->childChange (0, 1); else - ((CheckBookItem*)tqparent)->childChange (0, -1); + ((CheckBookItem*)parent)->childChange (0, -1); } } else propagateStateChange(); @@ -127,9 +127,9 @@ void CheckBookItem::propagateStateChange () { void CheckBookItem::childChange (int numberDiff, int selDiff) { numberOfBooks += numberDiff; selectedBooks += selDiff; - TQListViewItem *tqparent = this->tqparent(); - if (tqparent != 0) - ((CheckBookItem*)tqparent)->childChange (numberDiff, selDiff); + TQListViewItem *parent = this->parent(); + if (parent != 0) + ((CheckBookItem*)parent)->childChange (numberDiff, selDiff); TQString text = i18n(" (%1 of %2 books selected)"); text = text.tqarg(selectedBooks).tqarg(numberOfBooks); @@ -138,8 +138,8 @@ void CheckBookItem::childChange (int numberDiff, int selDiff) { /***************************************************************************/ -InitialPhraseBookWidget::InitialPhraseBookWidget (TQWidget *tqparent, const char *name) - : TQWidget(tqparent, name) +InitialPhraseBookWidget::InitialPhraseBookWidget (TQWidget *parent, const char *name) + : TQWidget(parent, name) { TQVBoxLayout *mainLayout = new TQVBoxLayout (this, 0, KDialog::spacingHint()); TQLabel *label = new TQLabel (i18n("Please decide which phrase books you need:"), this, "booksTitle"); @@ -165,7 +165,7 @@ InitialPhraseBookWidget::~InitialPhraseBookWidget () { void InitialPhraseBookWidget::initStandardPhraseBooks() { StandardBookList bookPaths = PhraseBookDialog::standardPhraseBooks(); - TQListViewItem *tqparent = 0; + TQListViewItem *parent = 0; TQListViewItem *last = 0; TQStringList currentNamePath = ""; TQPtrStack<TQListViewItem> stack; @@ -179,26 +179,26 @@ void InitialPhraseBookWidget::initStandardPhraseBooks() { for (; (it1 != currentNamePath.end()) && (it1 != dirs.end()) && (*it1 == *it2); ++it1, ++it2); for (; it1 != currentNamePath.end(); ++it1) { - last = tqparent; - tqparent = stack.pop(); + last = parent; + parent = stack.pop(); } for (; it2 != dirs.end(); ++it2) { - stack.push (tqparent); + stack.push (parent); TQListViewItem *newParent; - if (tqparent == 0) + if (parent == 0) newParent = new CheckBookItem (books, last, *it2, *it2, TQString()); else - newParent = new CheckBookItem (tqparent, last, *it2, *it2, TQString()); - tqparent = newParent; + newParent = new CheckBookItem (parent, last, *it2, *it2, TQString()); + parent = newParent; last = 0; } currentNamePath = dirs; TQListViewItem *book; - if (tqparent == 0) + if (parent == 0) book = new CheckBookItem (books, last, (*it).name, (*it).name, (*it).filename); else - book = new CheckBookItem (tqparent, last, (*it).name, (*it).name, (*it).filename); + book = new CheckBookItem (parent, last, (*it).name, (*it).name, (*it).filename); last = book; } } @@ -218,7 +218,7 @@ void InitialPhraseBookWidget::createBook () { } while ((item != 0) && (item->nextSibling() == 0)) { - item = item->tqparent(); + item = item->parent(); } if (item != 0) item = item->nextSibling(); @@ -233,8 +233,8 @@ void InitialPhraseBookWidget::createBook () { /***************************************************************************/ -ButtonBoxWidget::ButtonBoxWidget (TQWidget *tqparent, const char *name) -: ButtonBoxUI (tqparent, name) { +ButtonBoxWidget::ButtonBoxWidget (TQWidget *parent, const char *name) +: ButtonBoxUI (parent, name) { keyButtonPlaceLayout = new TQGridLayout (keyButtonPlace, 1, 1, 0, 0, "keyButtonPlaceLayout"); keyButton = new KKeyButton (keyButtonPlace, "key"); @@ -434,7 +434,7 @@ StandardBookList PhraseBookDialog::standardPhraseBooks() { void PhraseBookDialog::initStandardPhraseBooks () { StandardBookList bookPaths = standardPhraseBooks(); - KActionMenu *tqparent = fileImportStandardBook; + KActionMenu *parent = fileImportStandardBook; TQStringList currentNamePath = "x"; TQPtrStack<KActionMenu> stack; StandardBookList::iterator it; @@ -450,21 +450,21 @@ void PhraseBookDialog::initStandardPhraseBooks () { for (; (it1 != currentNamePath.end()) && (it1 != dirs.end()) && (*it1 == *it2); ++it1, ++it2); for (; it1 != currentNamePath.end(); ++it1) - tqparent = stack.pop(); + parent = stack.pop(); for (; it2 != dirs.end(); ++it2) { - stack.push (tqparent); + stack.push (parent); KActionMenu *newParent = new KActionMenu (*it2); - tqparent->insert(newParent); - if (tqparent == fileImportStandardBook) + parent->insert(newParent); + if (parent == fileImportStandardBook) newParent->plug(toolbarImport->popupMenu()); - tqparent = newParent; + parent = newParent; } currentNamePath = dirs; KAction *book = new StandardPhraseBookInsertAction ( url, (*it).name, TQT_TQOBJECT(this), TQT_SLOT(slotImportPhrasebook (const KURL &)), actionCollection()); - tqparent->insert(book); - if (tqparent == fileImportStandardBook) + parent->insert(book); + if (parent == fileImportStandardBook) book->plug(toolbarImport->popupMenu()); } } @@ -615,8 +615,8 @@ void PhraseBookDialog::setShortcut( const KShortcut& cut ) { } } -TQListViewItem *PhraseBookDialog::addBook (TQListViewItem *tqparent, TQListViewItem *after, PhraseBook *book) { - TQListViewItem *newItem = treeView->addBook(tqparent, after, book); +TQListViewItem *PhraseBookDialog::addBook (TQListViewItem *parent, TQListViewItem *after, PhraseBook *book) { + TQListViewItem *newItem = treeView->addBook(parent, after, book); if (newItem != 0) { treeView->clearSelection(); treeView->ensureItemVisible(newItem); @@ -631,8 +631,8 @@ TQListViewItem *PhraseBookDialog::addBook (TQListViewItem *item, PhraseBook *boo if (item == 0) return addBook(0, 0, book); else if (((PhraseTreeItem *)item)->isPhrase() || !item->isOpen()) - if (item->tqparent() != 0) - return addBook(item->tqparent(), item, book); + if (item->parent() != 0) + return addBook(item->parent(), item, book); else return addBook(0, item, book); else @@ -677,10 +677,10 @@ void PhraseBookDialog::slotPaste () { } } -void PhraseBookDialog::slotDropped (TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *after) { +void PhraseBookDialog::slotDropped (TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after) { PhraseBook book; if (PhraseBookDrag::decode(e, &book)) { - addBook(tqparent, after, &book); + addBook(parent, after, &book); } } diff --git a/kmouth/phrasebook/phrasebookdialog.h b/kmouth/phrasebook/phrasebookdialog.h index 1a09a79..cdd2dbe 100644 --- a/kmouth/phrasebook/phrasebookdialog.h +++ b/kmouth/phrasebook/phrasebookdialog.h @@ -50,9 +50,9 @@ typedef TQValueList<StandardBook> StandardBookList; class CheckBookItem : public TQCheckListItem { public: - CheckBookItem (TQListViewItem *tqparent, TQListViewItem *last, + CheckBookItem (TQListViewItem *parent, TQListViewItem *last, const TQString &text, const TQString &name, const TQString &filename); - CheckBookItem (TQListView *tqparent, TQListViewItem *last, + CheckBookItem (TQListView *parent, TQListViewItem *last, const TQString &text, const TQString &name, const TQString &filename); ~CheckBookItem(); @@ -76,7 +76,7 @@ class InitialPhraseBookWidget : public TQWidget { Q_OBJECT TQ_OBJECT public: - InitialPhraseBookWidget(TQWidget *tqparent, const char *name); + InitialPhraseBookWidget(TQWidget *parent, const char *name); ~InitialPhraseBookWidget(); void createBook(); @@ -97,8 +97,8 @@ class StandardPhraseBookInsertAction : public KAction { Q_OBJECT TQ_OBJECT public: - StandardPhraseBookInsertAction (const KURL &url, const TQString& name, const TQObject* receiver, const char* slot, KActionCollection* tqparent) - : KAction (name, "phrasebook", 0, 0, 0, tqparent, 0) { + StandardPhraseBookInsertAction (const KURL &url, const TQString& name, const TQObject* receiver, const char* slot, KActionCollection* parent) + : KAction (name, "phrasebook", 0, 0, 0, parent, 0) { this->url = url; connect (this, TQT_SIGNAL(slotActivated (const KURL &)), receiver, slot); }; @@ -125,7 +125,7 @@ private: */ class ButtonBoxWidget : public ButtonBoxUI { public: - ButtonBoxWidget (TQWidget *tqparent = 0, const char *name = 0); + ButtonBoxWidget (TQWidget *parent = 0, const char *name = 0); ~ButtonBoxWidget (); KKeyButton *keyButton; @@ -187,7 +187,7 @@ public slots: void slotExportPhrasebook (); void slotPrint (); - void slotDropped (TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *after); + void slotDropped (TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after); void slotMoved (TQListViewItem *item, TQListViewItem *, TQListViewItem *); signals: @@ -202,7 +202,7 @@ private: /** initializes the list of standard phrase books */ void initStandardPhraseBooks (); - TQListViewItem *addBook (TQListViewItem *tqparent, TQListViewItem *after, PhraseBook *book); + TQListViewItem *addBook (TQListViewItem *parent, TQListViewItem *after, PhraseBook *book); TQListViewItem *addBook (TQListViewItem *item, PhraseBook *book); void setShortcut (const KShortcut &cut); diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp index dcd08c6..e4adde1 100644 --- a/kmouth/phrasebook/phrasetree.cpp +++ b/kmouth/phrasebook/phrasetree.cpp @@ -28,8 +28,8 @@ #include "phrasebookdialog.h" #include "phrasebook.h" -PhraseTreeItem::PhraseTreeItem (TQListView *tqparent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon) - : KListViewItem (tqparent, after, phrase) +PhraseTreeItem::PhraseTreeItem (TQListView *parent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon) + : KListViewItem (parent, after, phrase) { isPhraseValue = true; cutValue = shortcut; @@ -38,8 +38,8 @@ PhraseTreeItem::PhraseTreeItem (TQListView *tqparent, TQListViewItem *after, TQS setExpandable (false); } -PhraseTreeItem::PhraseTreeItem (TQListViewItem *tqparent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon) - : KListViewItem (tqparent, after, phrase) +PhraseTreeItem::PhraseTreeItem (TQListViewItem *parent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon) + : KListViewItem (parent, after, phrase) { isPhraseValue = true; cutValue = shortcut; @@ -47,15 +47,15 @@ PhraseTreeItem::PhraseTreeItem (TQListViewItem *tqparent, TQListViewItem *after, setPixmap(0, icon); setExpandable (false); } -PhraseTreeItem::PhraseTreeItem (TQListView *tqparent, TQListViewItem *after, TQString name, TQPixmap icon) - : KListViewItem (tqparent, after, name) +PhraseTreeItem::PhraseTreeItem (TQListView *parent, TQListViewItem *after, TQString name, TQPixmap icon) + : KListViewItem (parent, after, name) { isPhraseValue = false; setPixmap(0, icon); setExpandable (true); } -PhraseTreeItem::PhraseTreeItem (TQListViewItem *tqparent, TQListViewItem *after, TQString name, TQPixmap icon) - : KListViewItem (tqparent, after, name) +PhraseTreeItem::PhraseTreeItem (TQListViewItem *parent, TQListViewItem *after, TQString name, TQPixmap icon) + : KListViewItem (parent, after, name) { isPhraseValue = false; setPixmap(0, icon); @@ -74,8 +74,8 @@ void PhraseTreeItem::setCut (KShortcut cut) { // *************************************************************************** -PhraseTree::PhraseTree (TQWidget *tqparent, const char *name) - : KListView (tqparent, name) +PhraseTree::PhraseTree (TQWidget *parent, const char *name) + : KListView (parent, name) { phrasebook_open = KGlobal::iconLoader()->loadIcon("phrasebook", KIcon::Small); phrasebook_closed = KGlobal::iconLoader()->loadIcon("phrasebook_closed", KIcon::Small); @@ -90,14 +90,14 @@ PhraseTree::~PhraseTree (){ namespace PhraseTreePrivate { TQListViewItem *prevSibling (TQListViewItem *item) { - TQListViewItem *tqparent = item->tqparent(); + TQListViewItem *parent = item->parent(); TQListViewItem *above = item->itemAbove(); - if (above == tqparent) + if (above == parent) return 0; - while (above->tqparent() != tqparent) - above = above->tqparent(); + while (above->parent() != parent) + above = above->parent(); return above; } @@ -109,25 +109,25 @@ namespace PhraseTreePrivate { if (item == 0) return false; - TQListViewItem *tqparent = item->tqparent(); + TQListViewItem *parent = item->parent(); TQListViewItem *above = item->itemAbove(); if (above == 0) return false; - else if (above == tqparent) { - *newParent = tqparent->tqparent(); - *newAbove = prevSibling (tqparent); + else if (above == parent) { + *newParent = parent->parent(); + *newAbove = prevSibling (parent); return true; } - else if (above->tqparent() == tqparent) { - *newParent = tqparent; + else if (above->parent() == parent) { + *newParent = parent; *newAbove = prevSibling (above); return true; } else { - while (above->tqparent()->tqparent() != tqparent) - above = above->tqparent(); - *newParent = above->tqparent(); + while (above->parent()->parent() != parent) + above = above->parent(); + *newParent = above->parent(); *newAbove = above; return true; } @@ -140,14 +140,14 @@ namespace PhraseTreePrivate { if (item == 0) return false; - TQListViewItem *tqparent = item->tqparent(); + TQListViewItem *parent = item->parent(); TQListViewItem *below = item->nextSibling(); - if (tqparent == 0 && below == 0) + if (parent == 0 && below == 0) return false; - else if (tqparent != 0 && below == 0) { - *newParent = tqparent->tqparent(); - *newAbove = tqparent; + else if (parent != 0 && below == 0) { + *newParent = parent->parent(); + *newAbove = parent; return true; } else if (below->isOpen()) { @@ -156,7 +156,7 @@ namespace PhraseTreePrivate { return true; } else { - *newParent = tqparent; + *newParent = parent; *newAbove = below; return true; } @@ -195,32 +195,32 @@ namespace PhraseTreePrivate { if (item == 0) return false; - TQListViewItem *tqparent = item->tqparent(); + TQListViewItem *parent = item->parent(); - if (tqparent == 0) + if (parent == 0) return false; else { - *newParent = tqparent->tqparent(); - *newAbove = tqparent; + *newParent = parent->parent(); + *newAbove = parent; return true; } } } void PhraseTree::moveItem (TQListViewItem *item, - TQListViewItem *tqparent, + TQListViewItem *parent, TQListViewItem *above) { if (item != 0) { - if (item->tqparent() == 0) + if (item->parent() == 0) takeItem (item); else - item->tqparent()->takeItem (item); + item->parent()->takeItem (item); - if (tqparent == 0) + if (parent == 0) insertItem (item); else - tqparent->insertItem (item); + parent->insertItem (item); item->moveItem(above); } @@ -241,7 +241,7 @@ bool PhraseTree::hasSelectedItems() { } else { while ((i != 0) && (i->nextSibling() == 0)) { - i = i->tqparent(); + i = i->parent(); level--; } if (i != 0) @@ -267,7 +267,7 @@ void PhraseTree::deleteSelectedItems() { } else { while ((i != 0) && (i->nextSibling() == 0)) { - i = i->tqparent(); + i = i->parent(); } if (i != 0) i = i->nextSibling(); @@ -285,11 +285,11 @@ void PhraseTree::keyPressEvent (TQKeyEvent *e) { if (e->key() == TQt::Key_Up) { TQListViewItem *item = currentItem(); if ((item != 0) && (item->isSelected())) { - TQListViewItem *tqparent; + TQListViewItem *parent; TQListViewItem *above; - if (PhraseTreePrivate::findAbovePosition (item, &tqparent, &above)) { - moveItem(item, tqparent, above); + if (PhraseTreePrivate::findAbovePosition (item, &parent, &above)) { + moveItem(item, parent, above); setCurrentItem (item); item->setSelected(true); } @@ -300,11 +300,11 @@ void PhraseTree::keyPressEvent (TQKeyEvent *e) { else if (e->key() == TQt::Key_Down) { TQListViewItem *item = currentItem(); if ((item != 0) && (item->isSelected())) { - TQListViewItem *tqparent; + TQListViewItem *parent; TQListViewItem *above; - if (PhraseTreePrivate::findBelowPosition (item, &tqparent, &above)) { - moveItem(item, tqparent, above); + if (PhraseTreePrivate::findBelowPosition (item, &parent, &above)) { + moveItem(item, parent, above); setCurrentItem (item); item->setSelected(true); } @@ -315,11 +315,11 @@ void PhraseTree::keyPressEvent (TQKeyEvent *e) { else if (e->key() == TQt::Key_Left) { TQListViewItem *item = currentItem(); if ((item != 0) && (item->isSelected())) { - TQListViewItem *tqparent; + TQListViewItem *parent; TQListViewItem *above; - if (PhraseTreePrivate::findLeftPosition (item, &tqparent, &above)) { - moveItem(item, tqparent, above); + if (PhraseTreePrivate::findLeftPosition (item, &parent, &above)) { + moveItem(item, parent, above); setCurrentItem (item); item->setSelected(true); } @@ -330,11 +330,11 @@ void PhraseTree::keyPressEvent (TQKeyEvent *e) { else if (e->key() == TQt::Key_Right) { TQListViewItem *item = currentItem(); if ((item != 0) && (item->isSelected())) { - TQListViewItem *tqparent; + TQListViewItem *parent; TQListViewItem *above; - if (PhraseTreePrivate::findRightPosition (item, &tqparent, &above)) { - moveItem(item, tqparent, above); + if (PhraseTreePrivate::findRightPosition (item, &parent, &above)) { + moveItem(item, parent, above); setCurrentItem (item); item->setSelected(true); } @@ -346,57 +346,57 @@ void PhraseTree::keyPressEvent (TQKeyEvent *e) { KListView::keyPressEvent(e); } -PhraseTreeItem *PhraseTree::insertPhrase (TQListViewItem *tqparent, TQListViewItem *after, TQString phrase, TQString shortcut) { +PhraseTreeItem *PhraseTree::insertPhrase (TQListViewItem *parent, TQListViewItem *after, TQString phrase, TQString shortcut) { KShortcut cut = KShortcut(shortcut); if (isKeyPresent (cut, 0, false)) cut = KShortcut(TQString()); - if (tqparent == 0) + if (parent == 0) return new PhraseTreeItem (this, after, phrase, cut, this->phrase); else - return new PhraseTreeItem (tqparent, after, phrase, cut, this->phrase); + return new PhraseTreeItem (parent, after, phrase, cut, this->phrase); } -PhraseTreeItem *PhraseTree::insertBook (TQListViewItem *tqparent, TQListViewItem *after, TQString name) { - if (tqparent == 0) +PhraseTreeItem *PhraseTree::insertBook (TQListViewItem *parent, TQListViewItem *after, TQString name) { + if (parent == 0) return new PhraseTreeItem (this, after, name, phrasebook_closed); else - return new PhraseTreeItem (tqparent, after, name, phrasebook_closed); + return new PhraseTreeItem (parent, after, name, phrasebook_closed); } -TQListViewItem *PhraseTree::addBook (TQListViewItem *tqparent, TQListViewItem *after, PhraseBook *book) { +TQListViewItem *PhraseTree::addBook (TQListViewItem *parent, TQListViewItem *after, PhraseBook *book) { TQListViewItem *last = after; int level = 0; PhraseBookEntryList::iterator it; for (it = book->begin(); it != book->end(); ++it) { int newLevel = (*it).getLevel(); while (level < newLevel) { - tqparent = insertBook(tqparent, last, ""); + parent = insertBook(parent, last, ""); last = 0; level++; } while (level > newLevel) { - last = tqparent; - if (tqparent != 0) - tqparent = tqparent->tqparent(); + last = parent; + if (parent != 0) + parent = parent->parent(); level--; } if ((*it).isPhrase()) { Phrase phrase = (*it).getPhrase(); - last = insertPhrase (tqparent, last, phrase.getPhrase(), phrase.getShortcut()); + last = insertPhrase (parent, last, phrase.getPhrase(), phrase.getShortcut()); } else { Phrase phrase = (*it).getPhrase(); - tqparent = insertBook(tqparent, last, phrase.getPhrase()); + parent = insertBook(parent, last, phrase.getPhrase()); last = 0; level++; } } while (level > 0) { - last = tqparent; - if (tqparent != 0) - tqparent = tqparent->tqparent(); + last = parent; + if (parent != 0) + parent = parent->parent(); level--; } return last; @@ -421,7 +421,7 @@ void PhraseTree::fillBook (PhraseBook *book, bool respectSelection) { } else { while ((i != 0) && (i->nextSibling() == 0)) { - i = i->tqparent(); + i = i->parent(); if (level > 0) level--; } diff --git a/kmouth/phrasebook/phrasetree.h b/kmouth/phrasebook/phrasetree.h index 26af68c..5633bc4 100644 --- a/kmouth/phrasebook/phrasetree.h +++ b/kmouth/phrasebook/phrasetree.h @@ -33,13 +33,13 @@ class PhraseTreeItem : public KListViewItem { friend class PhraseTree; private: /** Creates a phrase item within a sub phrase book */ - PhraseTreeItem (TQListView *tqparent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon); + PhraseTreeItem (TQListView *parent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon); /** Creates a phrase item at the top level */ - PhraseTreeItem (TQListViewItem *tqparent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon); + PhraseTreeItem (TQListViewItem *parent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon); /** Creates a phrase book item within a sub phrase book */ - PhraseTreeItem (TQListView *tqparent, TQListViewItem *after, TQString name, TQPixmap icon); + PhraseTreeItem (TQListView *parent, TQListViewItem *after, TQString name, TQPixmap icon); /** Creates a phrase book item at the top level */ - PhraseTreeItem (TQListViewItem *tqparent, TQListViewItem *after, TQString name, TQPixmap icon); + PhraseTreeItem (TQListViewItem *parent, TQListViewItem *after, TQString name, TQPixmap icon); public: bool isPhrase(); @@ -62,21 +62,21 @@ class PhraseTree : public KListView { Q_OBJECT TQ_OBJECT public: - PhraseTree (TQWidget *tqparent = 0, const char *name = 0); + PhraseTree (TQWidget *parent = 0, const char *name = 0); ~PhraseTree (); void keyPressEvent (TQKeyEvent *e); - PhraseTreeItem *insertPhrase (TQListViewItem *tqparent, TQListViewItem *after, TQString phrase, TQString shortcut); - PhraseTreeItem *insertBook (TQListViewItem *tqparent, TQListViewItem *after, TQString name); + PhraseTreeItem *insertPhrase (TQListViewItem *parent, TQListViewItem *after, TQString phrase, TQString shortcut); + PhraseTreeItem *insertBook (TQListViewItem *parent, TQListViewItem *after, TQString name); - TQListViewItem *addBook (TQListViewItem *tqparent, TQListViewItem *after, PhraseBook *book); + TQListViewItem *addBook (TQListViewItem *parent, TQListViewItem *after, PhraseBook *book); void fillBook (PhraseBook *book, bool respectSelection); TQDragObject *dragObject (); TQDragObject *dragObject (bool isDependent); - void moveItem (TQListViewItem *item, TQListViewItem *tqparent, TQListViewItem *above); + void moveItem (TQListViewItem *item, TQListViewItem *parent, TQListViewItem *above); bool hasSelectedItems(); void deleteSelectedItems(); diff --git a/kmouth/phraseedit.cpp b/kmouth/phraseedit.cpp index 4397bb6..4eced0e 100644 --- a/kmouth/phraseedit.cpp +++ b/kmouth/phraseedit.cpp @@ -17,8 +17,8 @@ #include "phraseedit.h" -PhraseEdit::PhraseEdit(const TQString &string, TQWidget *tqparent) - : KLineEdit (string, tqparent) { +PhraseEdit::PhraseEdit(const TQString &string, TQWidget *parent) + : KLineEdit (string, parent) { } PhraseEdit::~PhraseEdit() { diff --git a/kmouth/phraseedit.h b/kmouth/phraseedit.h index ccc5342..0ebd132 100644 --- a/kmouth/phraseedit.h +++ b/kmouth/phraseedit.h @@ -27,7 +27,7 @@ class PhraseEdit : public KLineEdit { public: - PhraseEdit(const TQString &string, TQWidget *tqparent); + PhraseEdit(const TQString &string, TQWidget *parent); virtual ~PhraseEdit(); void keyPressEvent (TQKeyEvent *e); diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp index 11d8b31..3cbd9d4 100644 --- a/kmouth/phraselist.cpp +++ b/kmouth/phraselist.cpp @@ -45,7 +45,7 @@ #include "phrasebook/phrasebook.h" #include "wordcompletion/wordcompletion.h" -PhraseList::PhraseList(TQWidget *tqparent, const char *name) : TQWidget(tqparent,name) { +PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,name) { isInSlot = false; setBackgroundMode(PaletteBase); TQVBoxLayout *tqlayout = new TQVBoxLayout (this); diff --git a/kmouth/phraselist.h b/kmouth/phraselist.h index cad58ad..cd86e83 100644 --- a/kmouth/phraselist.h +++ b/kmouth/phraselist.h @@ -42,7 +42,7 @@ class PhraseList : public TQWidget { Q_OBJECT TQ_OBJECT public: - PhraseList(TQWidget *tqparent=0, const char *name=0); + PhraseList(TQWidget *parent=0, const char *name=0); ~PhraseList(); /** contains the implementation for printing functionality */ diff --git a/kmouth/texttospeechconfigurationwidget.cpp b/kmouth/texttospeechconfigurationwidget.cpp index 11ad5d9..f7fe16a 100644 --- a/kmouth/texttospeechconfigurationwidget.cpp +++ b/kmouth/texttospeechconfigurationwidget.cpp @@ -31,8 +31,8 @@ #include <tqcheckbox.h> #include <kurlrequester.h> -TextToSpeechConfigurationWidget::TextToSpeechConfigurationWidget (TQWidget *tqparent, const char *name) - : texttospeechconfigurationui (tqparent, name) +TextToSpeechConfigurationWidget::TextToSpeechConfigurationWidget (TQWidget *parent, const char *name) + : texttospeechconfigurationui (parent, name) { ttsSystem = new TextToSpeechSystem(); diff --git a/kmouth/texttospeechconfigurationwidget.h b/kmouth/texttospeechconfigurationwidget.h index 0e567a3..a5ef3ba 100644 --- a/kmouth/texttospeechconfigurationwidget.h +++ b/kmouth/texttospeechconfigurationwidget.h @@ -30,7 +30,7 @@ class TextToSpeechConfigurationWidget : public texttospeechconfigurationui { friend class TextToSpeechConfigurationDialog; public: - TextToSpeechConfigurationWidget(TQWidget *tqparent, const char *name); + TextToSpeechConfigurationWidget(TQWidget *parent, const char *name); ~TextToSpeechConfigurationWidget(); TextToSpeechSystem *getTTSSystem() const; diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp index 14b7980..5108845 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.cpp +++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp @@ -42,10 +42,10 @@ #include "kdedocsourceui.h" #include "wordlist.h" -DictionaryCreationWizard::DictionaryCreationWizard (TQWidget *tqparent, const char *name, +DictionaryCreationWizard::DictionaryCreationWizard (TQWidget *parent, const char *name, TQStringList dictionaryNames, TQStringList dictionaryFiles, TQStringList dictionaryLanguages) - : KWizard (tqparent, name) + : KWizard (parent, name) { buildCodecList (); @@ -274,10 +274,10 @@ TQString DictionaryCreationWizard::language() { /***************************************************************************/ -MergeWidget::MergeWidget(KWizard *tqparent, const char *name, +MergeWidget::MergeWidget(KWizard *parent, const char *name, TQStringList dictionaryNames, TQStringList dictionaryFiles, TQStringList dictionaryLanguages) -: TQScrollView (tqparent, name) { +: TQScrollView (parent, name) { dictionaries.setAutoDelete (false); weights.setAutoDelete (false); @@ -340,8 +340,8 @@ TQString MergeWidget::language () { /***************************************************************************/ -CompletionWizardWidget::CompletionWizardWidget (KWizard *tqparent, const char *name) - : KDEDocSourceUI (tqparent, name) { +CompletionWizardWidget::CompletionWizardWidget (KWizard *parent, const char *name) + : KDEDocSourceUI (parent, name) { } CompletionWizardWidget::~CompletionWizardWidget() { diff --git a/kmouth/wordcompletion/dictionarycreationwizard.h b/kmouth/wordcompletion/dictionarycreationwizard.h index c2d1e2e..ea0784b 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.h +++ b/kmouth/wordcompletion/dictionarycreationwizard.h @@ -44,7 +44,7 @@ class DictionaryCreationWizard : public KWizard { Q_OBJECT TQ_OBJECT public: - DictionaryCreationWizard (TQWidget *tqparent, const char *name, + DictionaryCreationWizard (TQWidget *parent, const char *name, TQStringList dictionaryNames, TQStringList dictionaryFiles, TQStringList dictionaryLanguages); @@ -79,7 +79,7 @@ class MergeWidget : public TQScrollView { Q_OBJECT TQ_OBJECT public: - MergeWidget(KWizard *tqparent, const char *name, + MergeWidget(KWizard *parent, const char *name, TQStringList dictionaryNames, TQStringList dictionaryFiles, TQStringList dictionaryLanguages); @@ -104,7 +104,7 @@ class CompletionWizardWidget : public KDEDocSourceUI { TQ_OBJECT friend class ConfigWizard; public: - CompletionWizardWidget(KWizard *tqparent, const char *name); + CompletionWizardWidget(KWizard *parent, const char *name); ~CompletionWizardWidget(); void ok (KConfig *config); diff --git a/kmouth/wordcompletion/klanguagebutton.cpp b/kmouth/wordcompletion/klanguagebutton.cpp index 537e728..51d2066 100644 --- a/kmouth/wordcompletion/klanguagebutton.cpp +++ b/kmouth/wordcompletion/klanguagebutton.cpp @@ -80,8 +80,8 @@ KLanguageButton::~KLanguageButton() delete m_tags; } -KLanguageButton::KLanguageButton( TQWidget * tqparent, const char *name ) -: TQPushButton( tqparent, name ), +KLanguageButton::KLanguageButton( TQWidget * parent, const char *name ) +: TQPushButton( parent, name ), m_popup( 0 ), m_oldPopup( 0 ) { diff --git a/kmouth/wordcompletion/klanguagebutton.h b/kmouth/wordcompletion/klanguagebutton.h index 1c116b5..c38ff9e 100644 --- a/kmouth/wordcompletion/klanguagebutton.h +++ b/kmouth/wordcompletion/klanguagebutton.h @@ -43,7 +43,7 @@ class KLanguageButton : public TQPushButton TQ_OBJECT public: - KLanguageButton(TQWidget *tqparent=0, const char *name=0); + KLanguageButton(TQWidget *parent=0, const char *name=0); ~KLanguageButton(); void insertItem( const TQIconSet& icon, const TQString &text, diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp index 4c05557..2403faf 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.cpp +++ b/kmouth/wordcompletion/wordcompletionwidget.cpp @@ -39,18 +39,18 @@ class DictionaryListItem : public KListViewItem { public: - DictionaryListItem (TQListView *tqparent, TQString filename, TQString name, TQString language, TQString languageCode) - : KListViewItem (tqparent, name) { + DictionaryListItem (TQListView *parent, TQString filename, TQString name, TQString language, TQString languageCode) + : KListViewItem (parent, name) { setFilename (filename); setLanguage (language, languageCode); }; - DictionaryListItem (TQListView *tqparent, TQString filename, TQString name, TQString languageCode) - : KListViewItem (tqparent, name) { + DictionaryListItem (TQListView *parent, TQString filename, TQString name, TQString languageCode) + : KListViewItem (parent, name) { setFilename (filename); setLanguage (languageCode); }; - DictionaryListItem (TQListView *tqparent, TQListViewItem *after, TQString filename, TQString name, TQString languageCode) - : KListViewItem (tqparent, after, name) { + DictionaryListItem (TQListView *parent, TQListViewItem *after, TQString filename, TQString name, TQString languageCode) + : KListViewItem (parent, after, name) { setFilename (filename); setLanguage (languageCode); }; @@ -91,7 +91,7 @@ private: /***************************************************************************/ -WordCompletionWidget::WordCompletionWidget(TQWidget *tqparent, const char *name) : WordCompletionUI (tqparent, name) { +WordCompletionWidget::WordCompletionWidget(TQWidget *parent, const char *name) : WordCompletionUI (parent, name) { dictionaryList->setSorting (-1); // no sorted list // Connect the signals from hte KCMKTTSDWidget to this class diff --git a/kmouth/wordcompletion/wordcompletionwidget.h b/kmouth/wordcompletion/wordcompletionwidget.h index 6118642..09d05a2 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.h +++ b/kmouth/wordcompletion/wordcompletionwidget.h @@ -32,7 +32,7 @@ class WordCompletionWidget : public WordCompletionUI { Q_OBJECT TQ_OBJECT public: - WordCompletionWidget(TQWidget *tqparent, const char *name); + WordCompletionWidget(TQWidget *parent, const char *name); ~WordCompletionWidget(); /** diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp b/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp index f861a57..4fd00be 100644 --- a/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp +++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp @@ -28,8 +28,8 @@ using namespace std; // App specific includes #include "freeverbsetupimpl.h" -FreeverbSetupImpl::FreeverbSetupImpl(TQWidget *tqparent, const char *name, bool modal, KConfig *config ) - : Freeverb_Setup(tqparent,name,modal), m_config(config) { +FreeverbSetupImpl::FreeverbSetupImpl(TQWidget *parent, const char *name, bool modal, KConfig *config ) + : Freeverb_Setup(parent,name,modal), m_config(config) { // initialize Widgets Init(); diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.h b/ksayit/Freeverb_plugin/freeverbsetupimpl.h index b7c884f..b4f62be 100644 --- a/ksayit/Freeverb_plugin/freeverbsetupimpl.h +++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.h @@ -35,7 +35,7 @@ class FreeverbSetupImpl : public Freeverb_Setup { Q_OBJECT TQ_OBJECT public: - FreeverbSetupImpl(TQWidget *tqparent=0, const char *name=0, bool modal=true, KConfig *config=0); + FreeverbSetupImpl(TQWidget *parent=0, const char *name=0, bool modal=true, KConfig *config=0); ~FreeverbSetupImpl(); public slots: diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp index 64febd1..bb91885 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp @@ -41,19 +41,19 @@ KInstance *FreeverbPluginFactory::p_instance = 0L; // Factory Constructor -FreeverbPluginFactory::FreeverbPluginFactory(TQObject *tqparent, const char* name) +FreeverbPluginFactory::FreeverbPluginFactory(TQObject *parent, const char* name) { p_instance = new KInstance("FreeverbPluginFactory"); } -TQObject* FreeverbPluginFactory::createObject(TQObject *tqparent, const char* name, +TQObject* FreeverbPluginFactory::createObject(TQObject *parent, const char* name, const char*, const TQStringList &) { kdDebug(100200) << "FreeverbPluginFactory::createObject()" << endl; - TQObject* obj = new FreeverbPlugin( tqparent, name ); + TQObject* obj = new FreeverbPlugin( parent, name ); emit objectCreated( obj ); return obj; } @@ -62,8 +62,8 @@ TQObject* FreeverbPluginFactory::createObject(TQObject *tqparent, const char* na // Plugin Constructor -FreeverbPlugin::FreeverbPlugin(TQObject *tqparent, const char* name) //, KApplication *Appl) - : FXPlugin(tqparent, name) //, m_Appl(Appl) +FreeverbPlugin::FreeverbPlugin(TQObject *parent, const char* name) //, KApplication *Appl) + : FXPlugin(parent, name) //, m_Appl(Appl) { m_config = new KSimpleConfig("ksayit_freeverbrc"); diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.h b/ksayit/Freeverb_plugin/ksayitfreeverblib.h index aac4408..a642eab 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.h +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.h @@ -30,12 +30,12 @@ Q_OBJECT TQ_OBJECT public: // Consturctor - FreeverbPluginFactory(TQObject *tqparent=0, const char* name=0); + FreeverbPluginFactory(TQObject *parent=0, const char* name=0); // Destructor virtual ~FreeverbPluginFactory(){ delete p_instance; }; - TQObject* createObject(TQObject *tqparent=0, const char* name=0, + TQObject* createObject(TQObject *parent=0, const char* name=0, const char* className=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList()); @@ -54,7 +54,7 @@ Q_OBJECT TQ_OBJECT public: // Constructor - FreeverbPlugin(TQObject *tqparent=0, const char* name=0); //, KApplication *Appl=0); + FreeverbPlugin(TQObject *parent=0, const char* name=0); //, KApplication *Appl=0); // Destructor ~FreeverbPlugin(); diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp index 9680a88..707ebab 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.cpp +++ b/ksayit/KTTSD_Lib/kttsdlib.cpp @@ -27,8 +27,8 @@ #include "kttsdlibsetupimpl.h" -KTTSDLib::KTTSDLib(TQObject *tqparent, const char *name, KApplication *Appl) - : TQObject(tqparent, name), m_Appl(Appl) +KTTSDLib::KTTSDLib(TQObject *parent, const char *name, KApplication *Appl) + : TQObject(parent, name), m_Appl(Appl) { KGlobal::locale()->insertCatalogue("libKTTSD"); m_talker = new kttsdlibtalker2(static_cast<TQObject*>(this), "kttsdlibtalker"); diff --git a/ksayit/KTTSD_Lib/kttsdlib.h b/ksayit/KTTSD_Lib/kttsdlib.h index 929ef3a..d0e902b 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.h +++ b/ksayit/KTTSD_Lib/kttsdlib.h @@ -71,7 +71,7 @@ public slots: void slotTextStarted(const uint job); public: - KTTSDLib(TQObject *tqparent=0, const char *name=0, KApplication *Appl=0); + KTTSDLib(TQObject *parent=0, const char *name=0, KApplication *Appl=0); ~KTTSDLib(); diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp index 7267156..86f5c14 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp +++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp @@ -23,8 +23,8 @@ // App specific includes #include "kttsdlibsetupimpl.h" -KTTSDlibSetupImpl::KTTSDlibSetupImpl(TQWidget *tqparent, const char *name) - : KTTSDlibSetup(tqparent, name) +KTTSDlibSetupImpl::KTTSDlibSetupImpl(TQWidget *parent, const char *name) + : KTTSDlibSetup(parent, name) { } diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h index ed49df4..ce7c09a 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h +++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h @@ -28,7 +28,7 @@ class KTTSDlibSetupImpl : public KTTSDlibSetup Q_OBJECT TQ_OBJECT public: - KTTSDlibSetupImpl(TQWidget *tqparent = 0, const char *name = 0); + KTTSDlibSetupImpl(TQWidget *parent = 0, const char *name = 0); ~KTTSDlibSetupImpl(); diff --git a/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp b/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp index 10fceb9..c91f394 100644 --- a/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp +++ b/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp @@ -21,8 +21,8 @@ // App specific includes #include "kttsdlibtalker2.h" -kttsdlibtalker2::kttsdlibtalker2(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), DCOPStub("kttsd", "KSpeech") +kttsdlibtalker2::kttsdlibtalker2(TQObject *parent, const char *name) + : TQObject(parent, name), DCOPStub("kttsd", "KSpeech") { m_client = NULL; diff --git a/ksayit/KTTSD_Lib/kttsdlibtalker2.h b/ksayit/KTTSD_Lib/kttsdlibtalker2.h index 6627a6e..076a669 100644 --- a/ksayit/KTTSD_Lib/kttsdlibtalker2.h +++ b/ksayit/KTTSD_Lib/kttsdlibtalker2.h @@ -37,7 +37,7 @@ signals: void signalTextStopped(const uint); public: - kttsdlibtalker2(TQObject *tqparent = 0, const char *name = 0); + kttsdlibtalker2(TQObject *parent = 0, const char *name = 0); ~kttsdlibtalker2(); diff --git a/ksayit/src/Types.h b/ksayit/src/Types.h index 005f108..ec4475a 100644 --- a/ksayit/src/Types.h +++ b/ksayit/src/Types.h @@ -54,8 +54,8 @@ This abstract class is the interface to access the items of the TreeView. class ListViewInterface : public KListViewItem { public: - ListViewInterface(ListViewInterface *tqparent=0, TQString label=TQString()); - ListViewInterface(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + ListViewInterface(ListViewInterface *parent=0, TQString label=TQString()); + ListViewInterface(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ListViewInterface(KListView *lv=0, TQString label=TQString()); // ~ListViewItemInterface(); diff --git a/ksayit/src/contextmenuhandler.cpp b/ksayit/src/contextmenuhandler.cpp index 75f06e7..e6605f9 100644 --- a/ksayit/src/contextmenuhandler.cpp +++ b/ksayit/src/contextmenuhandler.cpp @@ -117,8 +117,8 @@ bool ContextActionHandler::characters( const TQString &ch ) /** * MenuHandler */ -ContextMenuHandler::ContextMenuHandler(TQObject *tqparent, const char *name) - : TQObject(tqparent, name), m_DocTreeView(tqparent) +ContextMenuHandler::ContextMenuHandler(TQObject *parent, const char *name) + : TQObject(parent, name), m_DocTreeView(parent) { m_popupmenu = NULL; m_item = NULL; @@ -378,9 +378,9 @@ KAction* ContextMenuHandler::ActionFactory( const TQString &actionName, const TQ } -KPopupMenu* ContextMenuHandler::SubMenuFactory(KPopupMenu *tqparent) +KPopupMenu* ContextMenuHandler::SubMenuFactory(KPopupMenu *parent) { - return new KPopupMenu(tqparent); + return new KPopupMenu(parent); } diff --git a/ksayit/src/contextmenuhandler.h b/ksayit/src/contextmenuhandler.h index 88d7c0e..8bb9d0a 100644 --- a/ksayit/src/contextmenuhandler.h +++ b/ksayit/src/contextmenuhandler.h @@ -69,7 +69,7 @@ class ContextMenuHandler : public TQObject Q_OBJECT TQ_OBJECT public: - ContextMenuHandler(TQObject *tqparent = 0, const char *name = 0); + ContextMenuHandler(TQObject *parent = 0, const char *name = 0); ~ContextMenuHandler(); @@ -80,10 +80,10 @@ public: KPopupMenu* getPopupMenu(ListViewInterface *item); /** - * \returns A pointer to the Submenu as a child of the tqparent - * \p tqparent. + * \returns A pointer to the Submenu as a child of the parent + * \p parent. */ - KPopupMenu* SubMenuFactory(KPopupMenu *tqparent); + KPopupMenu* SubMenuFactory(KPopupMenu *parent); /** * Creates an action sufficiant to the given name. diff --git a/ksayit/src/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp index 901d494..60a7bde 100644 --- a/ksayit/src/docbookclasses.cpp +++ b/ksayit/src/docbookclasses.cpp @@ -31,12 +31,12 @@ ////////////////////////////////////// // Interface ////////////////////////////////////// -ListViewInterface::ListViewInterface(ListViewInterface *tqparent, TQString label) - : KListViewItem( tqparent, label ) +ListViewInterface::ListViewInterface(ListViewInterface *parent, TQString label) + : KListViewItem( parent, label ) { } -ListViewInterface::ListViewInterface(ListViewInterface *tqparent, ListViewInterface *after, TQString label) : KListViewItem( tqparent, after, label ) +ListViewInterface::ListViewInterface(ListViewInterface *parent, ListViewInterface *after, TQString label) : KListViewItem( parent, after, label ) { } @@ -116,8 +116,8 @@ TQVariant RobDocument::getValue( unsigned int index ) const /** * Overview */ -Overview::Overview(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Overview::Overview(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small); this->setPixmap(0, pixmap); @@ -171,8 +171,8 @@ TQVariant Overview::getValue( unsigned int index ) const /** * Date */ -Date::Date(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Date::Date(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small); this->setPixmap(0, pixmap); @@ -238,8 +238,8 @@ TQVariant Date::getValue( unsigned int index ) const /** * ReleaseInfo */ -ReleaseInfo::ReleaseInfo(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +ReleaseInfo::ReleaseInfo(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small); this->setPixmap(0, pixmap); @@ -305,8 +305,8 @@ TQVariant ReleaseInfo::getValue( unsigned int index ) const /** * Authorgroup */ -AuthorGroup::AuthorGroup(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +AuthorGroup::AuthorGroup(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("kdmconfig", KIcon::Small); this->setPixmap(0, pixmap); @@ -361,8 +361,8 @@ TQVariant AuthorGroup::getValue( unsigned int index ) const /** * Author */ -Author::Author(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Author::Author(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("personal", KIcon::Small); this->setPixmap(0, pixmap); @@ -445,8 +445,8 @@ TQVariant Author::getValue( unsigned int index ) const /** * KeywordSet */ -KeywordSet::KeywordSet(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +KeywordSet::KeywordSet(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("txt", KIcon::Small); this->setPixmap(0, pixmap); @@ -500,8 +500,8 @@ TQVariant KeywordSet::getValue( unsigned int index ) const /** * Keyword */ -Keyword::Keyword(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Keyword::Keyword(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { // new Concept (begin) m_valueList.clear(); @@ -566,8 +566,8 @@ TQVariant Keyword::getValue( unsigned int index ) const /** * Abstract */ -Abstract::Abstract(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Abstract::Abstract(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small); this->setPixmap(0, pixmap); @@ -622,8 +622,8 @@ TQVariant Abstract::getValue( unsigned int index ) const /** * Para */ -Para::Para(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Para::Para(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -696,8 +696,8 @@ TQVariant Para::getValue( unsigned int index ) const /** * Chapter */ -Chapter::Chapter(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Chapter::Chapter(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -757,8 +757,8 @@ TQVariant Chapter::getValue( unsigned int index ) const /** * Sect1 */ -Sect1::Sect1(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Sect1::Sect1(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -817,8 +817,8 @@ TQVariant Sect1::getValue( unsigned int index ) const /** * Sect2 */ -Sect2::Sect2(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Sect2::Sect2(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -877,8 +877,8 @@ TQVariant Sect2::getValue( unsigned int index ) const /** * Sect3 */ -Sect3::Sect3(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Sect3::Sect3(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -937,8 +937,8 @@ TQVariant Sect3::getValue( unsigned int index ) const /** * Sect4 */ -Sect4::Sect4(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Sect4::Sect4(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -997,8 +997,8 @@ TQVariant Sect4::getValue( unsigned int index ) const /** * Sect5 */ -Sect5::Sect5(ListViewInterface *tqparent, ListViewInterface *after, TQString label) - : ListViewInterface(tqparent, after, label) +Sect5::Sect5(ListViewInterface *parent, ListViewInterface *after, TQString label) + : ListViewInterface(parent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); diff --git a/ksayit/src/docbookclasses.h b/ksayit/src/docbookclasses.h index e24af91..f19f9f0 100644 --- a/ksayit/src/docbookclasses.h +++ b/ksayit/src/docbookclasses.h @@ -32,7 +32,7 @@ class TQStringList; // /** Represents the root item of the document, therefore it expects - a \p TQListView object as tqparent.\n + a \p TQListView object as parent.\n Structural item only (no references to a DOM node). @author Robert Vogl */ @@ -41,7 +41,7 @@ class RobDocument : public ListViewInterface public: /** * Constructor - * \param lv The ListView tqparent. + * \param lv The ListView parent. * \param label The label is shown in column 0 of the TreeView and is also * used as bookmark title. */ @@ -67,7 +67,7 @@ private: class Overview : public ListViewInterface { public: - Overview(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Overview(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Overview(); bool setValue( unsigned int index, TQVariant data ); @@ -85,7 +85,7 @@ private: class Date : public ListViewInterface { public: - Date(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Date(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Date(); bool setValue( unsigned int index, TQVariant data ); @@ -104,7 +104,7 @@ private: class ReleaseInfo : public ListViewInterface { public: - ReleaseInfo(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + ReleaseInfo(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~ReleaseInfo(); bool setValue( unsigned int index, TQVariant data ); @@ -124,7 +124,7 @@ private: class AuthorGroup : public ListViewInterface { public: - AuthorGroup(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + AuthorGroup(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~AuthorGroup(); bool setValue( unsigned int index, TQVariant data ); @@ -143,7 +143,7 @@ private: class Author : public ListViewInterface { public: - Author(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Author(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Author(); bool setValue( unsigned int index, TQVariant data ); @@ -162,7 +162,7 @@ private: class KeywordSet : public ListViewInterface { public: - KeywordSet(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + KeywordSet(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~KeywordSet(); bool setValue( unsigned int index, TQVariant data ); @@ -180,7 +180,7 @@ private: class Keyword : public ListViewInterface { public: - Keyword(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Keyword(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Keyword(); bool setValue( unsigned int index, TQVariant data ); @@ -199,7 +199,7 @@ private: class Abstract : public ListViewInterface { public: - Abstract(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Abstract(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Abstract(); bool setValue( unsigned int index, TQVariant data ); @@ -217,7 +217,7 @@ private: class Para : public ListViewInterface { public: - Para(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Para(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Para(); bool setValue( unsigned int index, TQVariant data ); @@ -236,7 +236,7 @@ private: class Chapter : public ListViewInterface { public: - Chapter(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Chapter(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Chapter(); bool setValue( unsigned int index, TQVariant data ); @@ -255,7 +255,7 @@ private: class Sect1 : public ListViewInterface { public: - Sect1(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Sect1(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Sect1(); bool setValue( unsigned int index, TQVariant data ); @@ -274,7 +274,7 @@ private: class Sect2 : public ListViewInterface { public: - Sect2(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Sect2(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Sect2(); bool setValue( unsigned int index, TQVariant data ); @@ -293,7 +293,7 @@ private: class Sect3 : public ListViewInterface { public: - Sect3(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Sect3(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Sect3(); bool setValue( unsigned int index, TQVariant data ); @@ -312,7 +312,7 @@ private: class Sect4 : public ListViewInterface { public: - Sect4(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Sect4(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Sect4(); bool setValue( unsigned int index, TQVariant data ); @@ -331,7 +331,7 @@ private: class Sect5 : public ListViewInterface { public: - Sect5(ListViewInterface *tqparent=0, ListViewInterface *after=0, TQString label=TQString()); + Sect5(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString()); ~Sect5(); bool setValue( unsigned int index, TQVariant data ); diff --git a/ksayit/src/docbookgenerator.cpp b/ksayit/src/docbookgenerator.cpp index a6f8a72..d9ab809 100644 --- a/ksayit/src/docbookgenerator.cpp +++ b/ksayit/src/docbookgenerator.cpp @@ -105,10 +105,10 @@ void DocbookGenerator::writeTitleOfBook(TQTextStream &doc, ListViewInterface *it if ( whoAmI != "BookInfo" ) return; - // Documents title is stored in root element (tqparent of BookInfo) - ListViewInterface *tqparent = static_cast<ListViewInterface*>(item->tqparent()); - if ( tqparent ){ - TQString title = tqparent->text(0); + // Documents title is stored in root element (parent of BookInfo) + ListViewInterface *parent = static_cast<ListViewInterface*>(item->parent()); + if ( parent ){ + TQString title = parent->text(0); // add node to document doc << "<Title>" << title << "</Title>" << endl; diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp index c4b9797..98b76b1 100644 --- a/ksayit/src/doctreeviewimpl.cpp +++ b/ksayit/src/doctreeviewimpl.cpp @@ -41,8 +41,8 @@ ////////////////////////////////////// // TreeView Implementation ////////////////////////////////////// -DocTreeViewImpl::DocTreeViewImpl(TQWidget* tqparent, const char* name, WFlags fl) - : DocTreeView(tqparent, name, fl) +DocTreeViewImpl::DocTreeViewImpl(TQWidget* parent, const char* name, WFlags fl) + : DocTreeView(parent, name, fl) { m_rootItem = NULL; m_url = KURL(); @@ -553,10 +553,10 @@ void DocTreeViewImpl::recursiveBuildItemIdentifier(ListViewInterface* item, TQTe if ( !item ) return; - // 1. Do we have a tqparent (=parentItem)? + // 1. Do we have a parent (=parentItem)? // If no -> return, if yes -> recursive call ListViewInterface *parentItem = NULL; - parentItem = static_cast<ListViewInterface*>( item->tqparent() ); + parentItem = static_cast<ListViewInterface*>( item->parent() ); if ( parentItem ){ recursiveBuildItemIdentifier( parentItem, idstring ); } else { @@ -757,9 +757,9 @@ void DocTreeViewImpl::slotDeleteItem() ListViewInterface *itemToDelete = m_currentItem; ListViewInterface *parentItem = NULL; - parentItem = static_cast<ListViewInterface*>(itemToDelete->tqparent()); + parentItem = static_cast<ListViewInterface*>(itemToDelete->parent()); if ( !parentItem ) - return; // delete only items with tqparent + return; // delete only items with parent // try to delete bookmark TQString url = TQString(); diff --git a/ksayit/src/doctreeviewimpl.h b/ksayit/src/doctreeviewimpl.h index f461b84..3021dc8 100644 --- a/ksayit/src/doctreeviewimpl.h +++ b/ksayit/src/doctreeviewimpl.h @@ -40,7 +40,7 @@ all required methods to access or manipulate its content. class DocTreeViewImpl : public DocTreeView { public: - DocTreeViewImpl(TQWidget* tqparent=0, const char* name=0, WFlags fl=0); + DocTreeViewImpl(TQWidget* parent=0, const char* name=0, WFlags fl=0); ~DocTreeViewImpl(); diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp index a923f5c..25fc7a9 100644 --- a/ksayit/src/fxpluginhandler.cpp +++ b/ksayit/src/fxpluginhandler.cpp @@ -26,8 +26,8 @@ #include "ksayit_ttsplugin.h" -FXPluginHandler::FXPluginHandler(TQObject *tqparent, const char *name, KConfig *config) - : TQObject(tqparent, name), m_config(config) +FXPluginHandler::FXPluginHandler(TQObject *parent, const char *name, KConfig *config) + : TQObject(parent, name), m_config(config) { m_mapPluginList.clear(); m_lstActivePlugins.clear(); diff --git a/ksayit/src/fxpluginhandler.h b/ksayit/src/fxpluginhandler.h index ca4aa21..523f5af 100644 --- a/ksayit/src/fxpluginhandler.h +++ b/ksayit/src/fxpluginhandler.h @@ -49,7 +49,7 @@ class FXPluginHandler : public TQObject Q_OBJECT TQ_OBJECT public: - FXPluginHandler(TQObject *tqparent = 0, const char *name = 0, KConfig *config=0); + FXPluginHandler(TQObject *parent = 0, const char *name = 0, KConfig *config=0); ~FXPluginHandler(); public: // Methods diff --git a/ksayit/src/fxsetupimpl.cpp b/ksayit/src/fxsetupimpl.cpp index c066f88..fc0100e 100644 --- a/ksayit/src/fxsetupimpl.cpp +++ b/ksayit/src/fxsetupimpl.cpp @@ -27,10 +27,10 @@ // #include "freeverbsetupimpl.h" #include "fxpluginhandler.h" -FX_SetupImpl::FX_SetupImpl(TQWidget *tqparent, const char *name, +FX_SetupImpl::FX_SetupImpl(TQWidget *parent, const char *name, KConfig *config, FXPluginHandler *fxpluginhandler ) - : FX_Setup(tqparent,name), m_config(config), m_fxpluginhandler(fxpluginhandler) + : FX_Setup(parent,name), m_config(config), m_fxpluginhandler(fxpluginhandler) { m_fxpluginhandler->getPlugins(pluginlist); diff --git a/ksayit/src/fxsetupimpl.h b/ksayit/src/fxsetupimpl.h index fc868e6..d0bb367 100644 --- a/ksayit/src/fxsetupimpl.h +++ b/ksayit/src/fxsetupimpl.h @@ -40,7 +40,7 @@ class FX_SetupImpl : public FX_Setup { TQ_OBJECT public: - FX_SetupImpl(TQWidget *tqparent=0, const char *name=0, + FX_SetupImpl(TQWidget *parent=0, const char *name=0, KConfig *config=0, FXPluginHandler *fxpluginhandler=0); ~FX_SetupImpl(); diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp index bdf772c..cefaba6 100644 --- a/ksayit/src/ksayit.cpp +++ b/ksayit/src/ksayit.cpp @@ -55,9 +55,9 @@ #define KSAYITUI "ksayitui.rc" #define ID_STATUS_MSG 1 -KSayItApp::KSayItApp(TQWidget* tqparent, const char* name, WFlags f, +KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f, const TQCString &objID) - : KMainWindow(tqparent, name, f), DCOPObject(objID) + : KMainWindow(parent, name, f), DCOPObject(objID) { config = NULL; view = NULL; @@ -811,12 +811,12 @@ void KSayItApp::setActions(int actions) { // ACTIONS::PLAY | ACTIONS::STOP | ACTIONS::PAUSE | ACTIONS::FFWD | ACTIONS::FREV; - // Get the tqmask of supported actions from the plugin. - int tqmask = m_kttslib->getActions(); - kdDebug(100200) << TQString("KSayItApp:PSA: %1").tqarg(tqmask, 0, 2) << endl; + // Get the mask of supported actions from the plugin. + int mask = m_kttslib->getActions(); + kdDebug(100200) << TQString("KSayItApp:PSA: %1").tqarg(mask, 0, 2) << endl; // disable actions not supported by the plugin - int ma = actions & tqmask; + int ma = actions & mask; if (ma & ACTIONS::PLAY){ say->setEnabled(true); diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h index bf1e672..97d2c95 100644 --- a/ksayit/src/ksayit.h +++ b/ksayit/src/ksayit.h @@ -74,7 +74,7 @@ class KSayItApp : public KMainWindow, public DCOPObject public: /** construtor of KSayItApp, calls all init functions to create the application. */ - KSayItApp(TQWidget* tqparent=0, const char* name=0, WFlags f=0, + KSayItApp(TQWidget* parent=0, const char* name=0, WFlags f=0, const TQCString &objID=0); ~KSayItApp(); diff --git a/ksayit/src/ksayit_fxplugin.h b/ksayit/src/ksayit_fxplugin.h index 211ca36..89154a5 100644 --- a/ksayit/src/ksayit_fxplugin.h +++ b/ksayit/src/ksayit_fxplugin.h @@ -38,7 +38,7 @@ class FXPlugin : public TQObject // Q_OBJECT TQ_OBJECT public: - FXPlugin(TQObject *tqparent=0, const char* name=0){}; + FXPlugin(TQObject *parent=0, const char* name=0){}; /** Sets the Main application object. Useful for config objects etc. */ diff --git a/ksayit/src/ksayit_ttsplugin.h b/ksayit/src/ksayit_ttsplugin.h index bb3e9f9..68179d7 100644 --- a/ksayit/src/ksayit_ttsplugin.h +++ b/ksayit/src/ksayit_ttsplugin.h @@ -65,7 +65,7 @@ class TTSPlugin : public TQObject { protected: - TTSPlugin(TQObject *tqparent, const char *name) : TQObject(tqparent, name){}; + TTSPlugin(TQObject *parent, const char *name) : TQObject(parent, name){}; public: /** Returns the name of the plugin. This name is the unique identifier diff --git a/ksayit/src/ksayitbookmarkhandler.cpp b/ksayit/src/ksayitbookmarkhandler.cpp index 8e838d5..d764681 100644 --- a/ksayit/src/ksayitbookmarkhandler.cpp +++ b/ksayit/src/ksayitbookmarkhandler.cpp @@ -23,8 +23,8 @@ #include "ksayitbookmarkhandler.h" #include "ksayit.h" -KSayItBookmarkHandler::KSayItBookmarkHandler(KBookmarkManager *bkManager, KSayItApp* tqparent) - : KBookmarkOwner(), m_bkManager(bkManager), m_parent(tqparent) +KSayItBookmarkHandler::KSayItBookmarkHandler(KBookmarkManager *bkManager, KSayItApp* parent) + : KBookmarkOwner(), m_bkManager(bkManager), m_parent(parent) { m_ID = TQString(); m_title = TQString(); diff --git a/ksayit/src/ksayitbookmarkhandler.h b/ksayit/src/ksayitbookmarkhandler.h index 31be84c..ac98edf 100644 --- a/ksayit/src/ksayitbookmarkhandler.h +++ b/ksayit/src/ksayitbookmarkhandler.h @@ -31,7 +31,7 @@ class KSayItApp; class KSayItBookmarkHandler : public KBookmarkOwner { public: - KSayItBookmarkHandler(KBookmarkManager *bkManager=0, KSayItApp* tqparent=0); + KSayItBookmarkHandler(KBookmarkManager *bkManager=0, KSayItApp* parent=0); virtual ~KSayItBookmarkHandler(); public: diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp index e7054a2..cf10c32 100644 --- a/ksayit/src/ksayitsystemtray.cpp +++ b/ksayit/src/ksayitsystemtray.cpp @@ -26,8 +26,8 @@ // App specific includes #include "ksayitsystemtray.h" -KSayItSystemTray::KSayItSystemTray(TQWidget *tqparent, const char *name) - : KSystemTray(tqparent,name) +KSayItSystemTray::KSayItSystemTray(TQWidget *parent, const char *name) + : KSystemTray(parent,name) { initActions(); changeState( StateCLIPEMPTY::Instance() ); diff --git a/ksayit/src/ksayitsystemtray.h b/ksayit/src/ksayitsystemtray.h index cdeca47..093e219 100644 --- a/ksayit/src/ksayitsystemtray.h +++ b/ksayit/src/ksayitsystemtray.h @@ -44,7 +44,7 @@ class KSayItSystemTray : public KSystemTray { friend class State; public: - KSayItSystemTray(TQWidget *tqparent=0, const char *name=0); + KSayItSystemTray(TQWidget *parent=0, const char *name=0); ~KSayItSystemTray(); signals: diff --git a/ksayit/src/ksayitviewimpl.cpp b/ksayit/src/ksayitviewimpl.cpp index 07c5cdf..e3eb5ee 100644 --- a/ksayit/src/ksayitviewimpl.cpp +++ b/ksayit/src/ksayitviewimpl.cpp @@ -33,7 +33,7 @@ using namespace std; // App specific includes #include "ksayitviewimpl.h" -KSayItViewImpl::KSayItViewImpl(TQWidget *tqparent, const char *name ) : KSayItView(tqparent,name) { +KSayItViewImpl::KSayItViewImpl(TQWidget *parent, const char *name ) : KSayItView(parent,name) { // some presets diff --git a/ksayit/src/ksayitviewimpl.h b/ksayit/src/ksayitviewimpl.h index fab7e49..6128fe2 100644 --- a/ksayit/src/ksayitviewimpl.h +++ b/ksayit/src/ksayitviewimpl.h @@ -36,7 +36,7 @@ class KSayItViewImpl : public KSayItView { TQ_OBJECT public: - KSayItViewImpl(TQWidget *tqparent=0, const char *name=0); + KSayItViewImpl(TQWidget *parent=0, const char *name=0); ~KSayItViewImpl(); signals: diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp index 50e4e1c..298f32f 100644 --- a/ksayit/src/voicesetupdlg.cpp +++ b/ksayit/src/voicesetupdlg.cpp @@ -39,12 +39,12 @@ #include "fxpluginhandler.h" #include "kttsdlib.h" -VoiceSetupDlg::VoiceSetupDlg(TQWidget *tqparent, const char *name, const TQString &caption, +VoiceSetupDlg::VoiceSetupDlg(TQWidget *parent, const char *name, const TQString &caption, bool modal, KConfig *config, FXPluginHandler *fxpluginhandler, KTTSDLib *ttslib) - : KDialogBase(IconList, caption, Ok|Cancel, Ok, tqparent, name, modal, true), + : KDialogBase(IconList, caption, Ok|Cancel, Ok, parent, name, modal, true), m_config(config), m_fxpluginhandler(fxpluginhandler), m_kttslib(ttslib) diff --git a/ksayit/src/voicesetupdlg.h b/ksayit/src/voicesetupdlg.h index 10cc42e..30bb37d 100644 --- a/ksayit/src/voicesetupdlg.h +++ b/ksayit/src/voicesetupdlg.h @@ -36,7 +36,7 @@ class VoiceSetupDlg : public KDialogBase { TQ_OBJECT public: - VoiceSetupDlg(TQWidget *tqparent=0, const char *name=0, const TQString &caption=NULL, + VoiceSetupDlg(TQWidget *parent=0, const char *name=0, const TQString &caption=NULL, bool modal=true, KConfig *config=0, FXPluginHandler *fxpluginhandler=0, diff --git a/kttsd/app-plugins/kate/katekttsd.cpp b/kttsd/app-plugins/kate/katekttsd.cpp index 65017b7..0de06cc 100644 --- a/kttsd/app-plugins/kate/katekttsd.cpp +++ b/kttsd/app-plugins/kate/katekttsd.cpp @@ -38,8 +38,8 @@ K_EXPORT_COMPONENT_FACTORY( ktexteditor_kttsd, KGenericFactory<KateKttsdPlugin>( "ktexteditor_kttsd" ) ) -KateKttsdPlugin::KateKttsdPlugin( TQObject *tqparent, const char* name, const TQStringList& ) - : KTextEditor::Plugin ( (KTextEditor::Document*) tqparent, name ) +KateKttsdPlugin::KateKttsdPlugin( TQObject *parent, const char* name, const TQStringList& ) + : KTextEditor::Plugin ( (KTextEditor::Document*) parent, name ) { } @@ -80,7 +80,7 @@ KateKttsdPluginView::KateKttsdPluginView( KTextEditor::View *view, const char *n void KateKttsdPluginView::slotReadOut() { - KTextEditor::View *v = (KTextEditor::View*)tqparent(); + KTextEditor::View *v = (KTextEditor::View*)parent(); KTextEditor::SelectionInterface *si = KTextEditor::selectionInterface( v->document() ); TQString text; diff --git a/kttsd/app-plugins/kate/katekttsd.h b/kttsd/app-plugins/kate/katekttsd.h index cfcc750..d8f5512 100644 --- a/kttsd/app-plugins/kate/katekttsd.h +++ b/kttsd/app-plugins/kate/katekttsd.h @@ -31,7 +31,7 @@ class KateKttsdPlugin : public KTextEditor::Plugin, public KTextEditor::PluginVi TQ_OBJECT public: - KateKttsdPlugin( TQObject *tqparent = 0, + KateKttsdPlugin( TQObject *parent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); virtual ~KateKttsdPlugin(); diff --git a/kttsd/compat/interfaces/kspeech/kspeech.h b/kttsd/compat/interfaces/kspeech/kspeech.h index 31e9243..d321528 100644 --- a/kttsd/compat/interfaces/kspeech/kspeech.h +++ b/kttsd/compat/interfaces/kspeech/kspeech.h @@ -207,8 +207,8 @@ * "kttsd", object "KSpeech". * @verbatim - MyPart::MyPart(TQWidget *tqparent, const char *name) : - KParts::ReadOnlyPart(tqparent, name), + MyPart::MyPart(TQWidget *parent, const char *name) : + KParts::ReadOnlyPart(parent, name), DCOPStub("kttsd", "KSpeech") { @endverbatim * @@ -293,8 +293,8 @@ * receiving object. * @verbatim - MyPart::MyPart(TQWidget *tqparent, const char *name) : - KParts::ReadOnlyPart(tqparent, name), + MyPart::MyPart(TQWidget *parent, const char *name) : + KParts::ReadOnlyPart(parent, name), DCOPObject("mypart_kspeechsink") { @endverbatim * diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index be6a244..0460521 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -56,8 +56,8 @@ /** * Constructor */ -SbdConf::SbdConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(tqparent, name) +SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(parent, name) { // kdDebug() << "SbdConf::SbdConf: Running" << endl; diff --git a/kttsd/filters/sbd/sbdconf.h b/kttsd/filters/sbd/sbdconf.h index f2610c4..d2e2ae0 100644 --- a/kttsd/filters/sbd/sbdconf.h +++ b/kttsd/filters/sbd/sbdconf.h @@ -49,7 +49,7 @@ class SbdConf : public KttsFilterConf /** * Constructor */ - SbdConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); + SbdConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp index d7e274c..107e6b3 100644 --- a/kttsd/filters/sbd/sbdproc.cpp +++ b/kttsd/filters/sbd/sbdproc.cpp @@ -41,8 +41,8 @@ /** * Constructor. */ -SbdThread::SbdThread( TQObject *tqparent, const char *name ) : - TQObject( tqparent, name ), +SbdThread::SbdThread( TQObject *parent, const char *name ) : + TQObject( parent, name ), TQThread() { } @@ -562,11 +562,11 @@ bool SbdThread::event ( TQEvent * e ) /** * Constructor. */ -SbdProc::SbdProc( TQObject *tqparent, const char *name, const TQStringList& /*args*/) : - KttsFilterProc(tqparent, name) +SbdProc::SbdProc( TQObject *parent, const char *name, const TQStringList& /*args*/) : + KttsFilterProc(parent, name) { // kdDebug() << "SbdProc::SbdProc: Running" << endl; - m_sbdThread = new SbdThread( tqparent, *name + "_thread" ); + m_sbdThread = new SbdThread( parent, *name + "_thread" ); connect( m_sbdThread, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotSbdThreadFilteringFinished()) ); } diff --git a/kttsd/filters/sbd/sbdproc.h b/kttsd/filters/sbd/sbdproc.h index 49f7b09..0c1e7aa 100644 --- a/kttsd/filters/sbd/sbdproc.h +++ b/kttsd/filters/sbd/sbdproc.h @@ -69,7 +69,7 @@ class SbdThread: public TQObject, public TQThread /** * Constructor. */ - SbdThread( TQObject *tqparent = 0, const char *name = 0); + SbdThread( TQObject *parent = 0, const char *name = 0); /** * Destructor. @@ -247,7 +247,7 @@ class SbdProc : virtual public KttsFilterProc /** * Constructor. */ - SbdProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + SbdProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index 7954b13..ab71382 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -59,8 +59,8 @@ /** * Constructor */ -StringReplacerConf::StringReplacerConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(tqparent, name), +StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(parent, name), m_editDlg(0), m_editWidget(0) { diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.h b/kttsd/filters/stringreplacer/stringreplacerconf.h index 4de870c..fe99f3f 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.h +++ b/kttsd/filters/stringreplacer/stringreplacerconf.h @@ -49,7 +49,7 @@ class StringReplacerConf : public KttsFilterConf /** * Constructor */ - StringReplacerConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); + StringReplacerConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.cpp b/kttsd/filters/stringreplacer/stringreplacerproc.cpp index 3715654..f3628f1 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerproc.cpp @@ -44,8 +44,8 @@ /** * Constructor. */ -StringReplacerProc::StringReplacerProc( TQObject *tqparent, const char *name, const TQStringList& ) : - KttsFilterProc(tqparent, name) +StringReplacerProc::StringReplacerProc( TQObject *parent, const char *name, const TQStringList& ) : + KttsFilterProc(parent, name) { } diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.h b/kttsd/filters/stringreplacer/stringreplacerproc.h index 175bda8..0fffbc9 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.h +++ b/kttsd/filters/stringreplacer/stringreplacerproc.h @@ -44,7 +44,7 @@ public: /** * Constructor. */ - StringReplacerProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + StringReplacerProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index cbdbfb2..350f845 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -49,8 +49,8 @@ /** * Constructor */ -TalkerChooserConf::TalkerChooserConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(tqparent, name) +TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(parent, name) { // kdDebug() << "TalkerChooserConf::TalkerChooserConf: Running" << endl; diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.h b/kttsd/filters/talkerchooser/talkerchooserconf.h index be501a2..56dc326 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.h +++ b/kttsd/filters/talkerchooser/talkerchooserconf.h @@ -51,7 +51,7 @@ class TalkerChooserConf : public KttsFilterConf /** * Constructor */ - TalkerChooserConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); + TalkerChooserConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.cpp b/kttsd/filters/talkerchooser/talkerchooserproc.cpp index 30ef605..2ea8134 100644 --- a/kttsd/filters/talkerchooser/talkerchooserproc.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserproc.cpp @@ -38,8 +38,8 @@ /** * Constructor. */ -TalkerChooserProc::TalkerChooserProc( TQObject *tqparent, const char *name, const TQStringList& /*args*/ ) : - KttsFilterProc(tqparent, name) +TalkerChooserProc::TalkerChooserProc( TQObject *parent, const char *name, const TQStringList& /*args*/ ) : + KttsFilterProc(parent, name) { // kdDebug() << "TalkerChooserProc::TalkerChooserProc: Running" << endl; } diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.h b/kttsd/filters/talkerchooser/talkerchooserproc.h index a422000..35096b7 100644 --- a/kttsd/filters/talkerchooser/talkerchooserproc.h +++ b/kttsd/filters/talkerchooser/talkerchooserproc.h @@ -37,7 +37,7 @@ public: /** * Constructor. */ - TalkerChooserProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + TalkerChooserProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp index 8247a01..c143f21 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp @@ -43,8 +43,8 @@ /** * Constructor */ -XmlTransformerConf::XmlTransformerConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(tqparent, name) +XmlTransformerConf::XmlTransformerConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(parent, name) { // kdDebug() << "XmlTransformerConf::XmlTransformerConf: Running" << endl; diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.h b/kttsd/filters/xmltransformer/xmltransformerconf.h index c10b90b..29c985a 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.h +++ b/kttsd/filters/xmltransformer/xmltransformerconf.h @@ -46,7 +46,7 @@ class XmlTransformerConf : public KttsFilterConf /** * Constructor */ - XmlTransformerConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); + XmlTransformerConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index 27c4cd4..272b6ca 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -44,8 +44,8 @@ /** * Constructor. */ -XmlTransformerProc::XmlTransformerProc( TQObject *tqparent, const char *name, const TQStringList& ) : - KttsFilterProc(tqparent, name) +XmlTransformerProc::XmlTransformerProc( TQObject *parent, const char *name, const TQStringList& ) : + KttsFilterProc(parent, name) { m_xsltProc = 0; } diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.h b/kttsd/filters/xmltransformer/xmltransformerproc.h index 4f8b82b..96eefab 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.h +++ b/kttsd/filters/xmltransformer/xmltransformerproc.h @@ -42,7 +42,7 @@ public: /** * Constructor. */ - XmlTransformerProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); + XmlTransformerProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/kcmkttsmgr/addtalker.cpp b/kttsd/kcmkttsmgr/addtalker.cpp index f97e263..200d419 100644 --- a/kttsd/kcmkttsmgr/addtalker.cpp +++ b/kttsd/kcmkttsmgr/addtalker.cpp @@ -34,8 +34,8 @@ // KTTS includes. #include "addtalker.h" -AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* tqparent, const char* name, WFlags fl) - : AddTalkerWidget(tqparent,name,fl) +AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent, const char* name, WFlags fl) + : AddTalkerWidget(parent,name,fl) { // Build maps. setSynthToLangMap(synthToLangMap); diff --git a/kttsd/kcmkttsmgr/addtalker.h b/kttsd/kcmkttsmgr/addtalker.h index 0c3f703..bb969d5 100644 --- a/kttsd/kcmkttsmgr/addtalker.h +++ b/kttsd/kcmkttsmgr/addtalker.h @@ -42,10 +42,10 @@ public: /** * Constructor. * @param synthToLangMap TQMap of supported language codes indexed by synthesizer. - * @param tqparent Inherited KDialog parameter. + * @param parent Inherited KDialog parameter. * @param name Inherited KDialog parameter. */ - AddTalker(SynthToLangMap synthToLangMap, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); + AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); /** * Destructor. diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index e60a720..c81feea 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -104,10 +104,10 @@ K_EXPORT_COMPONENT_FACTORY( kcm_kttsd, KCMKttsMgrFactory("kttsd") ) * Makes the list of plug ins. * And the languages acording to the plug ins. */ -KCMKttsMgr::KCMKttsMgr(TQWidget *tqparent, const char *name, const TQStringList &) : +KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) : DCOPStub("kttsd", "KSpeech"), DCOPObject("kcmkttsmgr_kspeechsink"), - KCModule(KCMKttsMgrFactory::instance(), tqparent, name) + KCModule(KCMKttsMgrFactory::instance(), parent, name) { // kdDebug() << "KCMKttsMgr contructor running." << endl; @@ -2396,7 +2396,7 @@ void KCMKttsMgr::slotNotifyListView_selectionChanged() bool defaultItem = ( item->text(nlvcEventSrc) == "default" ); m_kttsmgrw->notifyRemoveButton->setEnabled( !defaultItem ); } else { - bool defaultItem = ( item->tqparent()->text(nlvcEventSrc) == "default" ); + bool defaultItem = ( item->parent()->text(nlvcEventSrc) == "default" ); m_kttsmgrw->notifyPresentComboBox->setEnabled( defaultItem ); if ( defaultItem ) m_kttsmgrw->notifyPresentComboBox->setCurrentItem( NotifyPresent::present( item->text( nlvcEvent ) ) ); @@ -2558,7 +2558,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem( } // No duplicates. item = lv->findItem( event, nlvcEvent ); - if ( !item || item->tqparent() != parentItem ) + if ( !item || item->parent() != parentItem ) item = new KListViewItem(parentItem, eventName, actionDisplayName, talkerName, eventSrc, event, actionName, talkerCode.getTalkerCode()); if ( action == NotifyAction::DoNotSpeak ) @@ -2644,7 +2644,7 @@ void KCMKttsMgr::slotNotifyRemoveButton_clicked() { TQListViewItem* item = m_kttsmgrw->notifyListView->selectedItem(); if (!item) return; - TQListViewItem* parentItem = item->tqparent(); + TQListViewItem* parentItem = item->parent(); delete item; if (parentItem) { @@ -2688,16 +2688,16 @@ void KCMKttsMgr::slotNotifySaveButton_clicked() // ---------------------------------------------------------------------------- -KttsCheckListItem::KttsCheckListItem( TQListView *tqparent, TQListViewItem *after, +KttsCheckListItem::KttsCheckListItem( TQListView *parent, TQListViewItem *after, const TQString &text, Type tt, KCMKttsMgr* kcmkttsmgr ) : - TQCheckListItem(tqparent, after, text, tt), + TQCheckListItem(parent, after, text, tt), m_kcmkttsmgr(kcmkttsmgr) { } -KttsCheckListItem::KttsCheckListItem( TQListView *tqparent, +KttsCheckListItem::KttsCheckListItem( TQListView *parent, const TQString &text, Type tt, KCMKttsMgr* kcmkttsmgr ) : - TQCheckListItem(tqparent, text, tt), + TQCheckListItem(parent, text, tt), m_kcmkttsmgr(kcmkttsmgr) { } /*virtual*/ void KttsCheckListItem::stateChange(bool) diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.h b/kttsd/kcmkttsmgr/kcmkttsmgr.h index 5edb02e..0754287 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.h +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.h @@ -58,7 +58,7 @@ class KCMKttsMgr : TQ_OBJECT public: - KCMKttsMgr(TQWidget *tqparent, const char *name, const TQStringList &); + KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &); ~KCMKttsMgr(); @@ -514,10 +514,10 @@ class KCMKttsMgr : class KttsCheckListItem : public TQCheckListItem { public: - KttsCheckListItem( TQListView *tqparent, + KttsCheckListItem( TQListView *parent, const TQString &text, Type tt = RadioButtonController, KCMKttsMgr* kcmkttsmgr = 0); - KttsCheckListItem( TQListView *tqparent, TQListViewItem *after, + KttsCheckListItem( TQListView *parent, TQListViewItem *after, const TQString &text, Type tt = RadioButtonController, KCMKttsMgr* kcmkttsmgr = 0); diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 921d296..4c5c1c1 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -36,8 +36,8 @@ #include "utils.h" #include "selectevent.h" -SelectEvent::SelectEvent(TQWidget* tqparent, const char* name, WFlags fl, const TQString& initEventSrc) - : SelectEventWidget(tqparent,name,fl) +SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQString& initEventSrc) + : SelectEventWidget(parent,name,fl) { // Load list of event sources (applications). TQStringList fullpaths = diff --git a/kttsd/kcmkttsmgr/selectevent.h b/kttsd/kcmkttsmgr/selectevent.h index f7ce996..720efda 100644 --- a/kttsd/kcmkttsmgr/selectevent.h +++ b/kttsd/kcmkttsmgr/selectevent.h @@ -34,11 +34,11 @@ class SelectEvent : public SelectEventWidget public: /** * Constructor. - * @param tqparent Inherited KDialog parameter. + * @param parent Inherited KDialog parameter. * @param name Inherited KDialog parameter. * @param initEventSrc Event source to start with. */ - SelectEvent(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0, + SelectEvent(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0, const TQString& initEventSrc = TQString() ); /** diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp index 41e521d..5e4065a 100644 --- a/kttsd/kttsd/filtermgr.cpp +++ b/kttsd/kttsd/filtermgr.cpp @@ -37,8 +37,8 @@ /** * Constructor. */ -FilterMgr::FilterMgr( TQObject *tqparent, const char *name) : - KttsFilterProc(tqparent, name) +FilterMgr::FilterMgr( TQObject *parent, const char *name) : + KttsFilterProc(parent, name) { // kdDebug() << "FilterMgr::FilterMgr: Running" << endl; m_state = fsIdle; diff --git a/kttsd/kttsd/filtermgr.h b/kttsd/kttsd/filtermgr.h index 539329b..fab8719 100644 --- a/kttsd/kttsd/filtermgr.h +++ b/kttsd/kttsd/filtermgr.h @@ -46,7 +46,7 @@ class FilterMgr : public KttsFilterProc /** * Constructor. */ - FilterMgr(TQObject *tqparent = 0, const char *name = 0); + FilterMgr(TQObject *parent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp index 211d757..de4320c 100644 --- a/kttsd/kttsd/kttsd.cpp +++ b/kttsd/kttsd/kttsd.cpp @@ -49,9 +49,9 @@ * Note that most of the real tts work occurs in Speaker. */ -KTTSD::KTTSD(const TQCString& objId, TQObject *tqparent, const char *name) : +KTTSD::KTTSD(const TQCString& objId, TQObject *parent, const char *name) : DCOPObject(objId), - TQObject(tqparent, name) + TQObject(parent, name) { // kdDebug() << "KTTSD::KTTSD Running" << endl; m_speaker = 0; @@ -1096,9 +1096,9 @@ TQString KTTSD::fixNullString(const TQString &talker) const // kspeech is obsolete. Applications should use KSpeech instead. // Constructor. -kspeech::kspeech(const TQCString& objId, TQObject *tqparent, const char *name) : +kspeech::kspeech(const TQCString& objId, TQObject *parent, const char *name) : DCOPObject(objId), - TQObject(tqparent, name), + TQObject(parent, name), m_kttsd("KSpeech") { } diff --git a/kttsd/kttsd/kttsd.h b/kttsd/kttsd/kttsd.h index c082f1d..d0fb97f 100644 --- a/kttsd/kttsd/kttsd.h +++ b/kttsd/kttsd/kttsd.h @@ -49,7 +49,7 @@ class KTTSD : public TQObject, virtual public KSpeech * Create objects, speechData and speaker. * Start thread */ - KTTSD(const TQCString& objId, TQObject *tqparent=0, const char *name=0); + KTTSD(const TQCString& objId, TQObject *parent=0, const char *name=0); /** * Destructor. @@ -638,7 +638,7 @@ class kspeech : public TQObject, virtual public KSpeech public: // Constructor. - kspeech(const TQCString& objId, TQObject *tqparent=0, const char *name=0); + kspeech(const TQCString& objId, TQObject *parent=0, const char *name=0); // Destructor. ~kspeech(); diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp index b38f0a0..13efc10 100644 --- a/kttsd/kttsd/speaker.cpp +++ b/kttsd/kttsd/speaker.cpp @@ -107,8 +107,8 @@ * Loads plugins. */ Speaker::Speaker( SpeechData*speechData, TalkerMgr* talkerMgr, - TQObject *tqparent, const char *name) : - TQObject(tqparent, name), + TQObject *parent, const char *name) : + TQObject(parent, name), m_speechData(speechData), m_talkerMgr(talkerMgr) { diff --git a/kttsd/kttsd/speaker.h b/kttsd/kttsd/speaker.h index 9ae1921..662020e 100644 --- a/kttsd/kttsd/speaker.h +++ b/kttsd/kttsd/speaker.h @@ -119,7 +119,7 @@ class Speaker : public TQObject{ * Calls load plug ins */ Speaker(SpeechData* speechData, TalkerMgr* talkerMgr, - TQObject *tqparent = 0, const char *name = 0); + TQObject *parent = 0, const char *name = 0); /** * Destructor diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp index 4e244fb..8d6264b 100644 --- a/kttsd/kttsd/talkermgr.cpp +++ b/kttsd/kttsd/talkermgr.cpp @@ -37,8 +37,8 @@ /** * Constructor. */ -TalkerMgr::TalkerMgr(TQObject *tqparent, const char *name) : - TQObject( tqparent, name ) +TalkerMgr::TalkerMgr(TQObject *parent, const char *name) : + TQObject( parent, name ) { m_loadedPlugIns.setAutoDelete(true); } diff --git a/kttsd/kttsd/talkermgr.h b/kttsd/kttsd/talkermgr.h index 2f3ce95..8c79596 100644 --- a/kttsd/kttsd/talkermgr.h +++ b/kttsd/kttsd/talkermgr.h @@ -41,7 +41,7 @@ public: /** * Constructor. */ - TalkerMgr(TQObject *tqparent = 0, const char *name = 0); + TalkerMgr(TQObject *parent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/kttsd/threadedplugin.cpp b/kttsd/kttsd/threadedplugin.cpp index 6158588..5df0c0f 100644 --- a/kttsd/kttsd/threadedplugin.cpp +++ b/kttsd/kttsd/threadedplugin.cpp @@ -33,8 +33,8 @@ * Constructor. */ ThreadedPlugIn::ThreadedPlugIn(PlugInProc* plugin, - TQObject *tqparent /*= 0*/, const char *name /*= 0*/): - PlugInProc(tqparent, name), + TQObject *parent /*= 0*/, const char *name /*= 0*/): + PlugInProc(parent, name), TQThread(), m_plugin(plugin), m_filename(TQString()), diff --git a/kttsd/kttsd/threadedplugin.h b/kttsd/kttsd/threadedplugin.h index c2ee0d6..1a1b13e 100644 --- a/kttsd/kttsd/threadedplugin.h +++ b/kttsd/kttsd/threadedplugin.h @@ -45,7 +45,7 @@ class ThreadedPlugIn : public PlugInProc, public TQThread /** * Constructor. */ - ThreadedPlugIn(PlugInProc* plugin, TQObject *tqparent = 0, const char *name = 0); + ThreadedPlugIn(PlugInProc* plugin, TQObject *parent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp index a9ddb96..2d6477e 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.cpp +++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp @@ -65,10 +65,10 @@ KttsJobMgrFactory::~KttsJobMgrFactory() s_instance = 0; } -TQObject *KttsJobMgrFactory::createObject(TQObject *tqparent, const char *name, const char*, +TQObject *KttsJobMgrFactory::createObject(TQObject *parent, const char *name, const char*, const TQStringList& ) { - TQObject *obj = new KttsJobMgrPart((TQWidget*)tqparent, name); + TQObject *obj = new KttsJobMgrPart((TQWidget*)parent, name); emit objectCreated(obj); return obj; } @@ -86,10 +86,10 @@ KAboutData *KttsJobMgrFactory::aboutData() return about; } -KttsJobMgrPart::KttsJobMgrPart(TQWidget *tqparent, const char *name) : +KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : DCOPStub("kttsd", "KSpeech"), DCOPObject("kttsjobmgr_kspeechsink"), - KParts::ReadOnlyPart(TQT_TQOBJECT(tqparent), name) + KParts::ReadOnlyPart(TQT_TQOBJECT(parent), name) { // Initialize some variables. m_selectOnTextSet = false; @@ -101,7 +101,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *tqparent, const char *name) : KGlobal::locale()->insertCatalogue("kttsd"); // Create a TQVBox to host everything. - TQVBox* vBox = new TQVBox(tqparent); + TQVBox* vBox = new TQVBox(parent); vBox->setMargin(6); // Create a splitter to contain the Job List View and the current sentence. @@ -1013,8 +1013,8 @@ ASYNC KttsJobMgrPart::textRemoved(const TQCString&, const uint jobNum) autoSelectInJobListView(); } -KttsJobMgrBrowserExtension::KttsJobMgrBrowserExtension(KttsJobMgrPart *tqparent) - : KParts::BrowserExtension(tqparent, "KttsJobMgrBrowserExtension") +KttsJobMgrBrowserExtension::KttsJobMgrBrowserExtension(KttsJobMgrPart *parent) + : KParts::BrowserExtension(parent, "KttsJobMgrBrowserExtension") { } diff --git a/kttsd/kttsjobmgr/kttsjobmgr.h b/kttsd/kttsjobmgr/kttsjobmgr.h index 216531d..506b551 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.h +++ b/kttsd/kttsjobmgr/kttsjobmgr.h @@ -42,7 +42,7 @@ public: KttsJobMgrFactory() {}; virtual ~KttsJobMgrFactory(); - virtual TQObject* createObject(TQObject* tqparent = 0, const char* name = 0, + virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); @@ -61,7 +61,7 @@ class KttsJobMgrPart: Q_OBJECT TQ_OBJECT public: - KttsJobMgrPart(TQWidget *tqparent, const char *name); + KttsJobMgrPart(TQWidget *parent, const char *name); virtual ~KttsJobMgrPart(); protected: @@ -293,7 +293,7 @@ class KttsJobMgrBrowserExtension : public KParts::BrowserExtension TQ_OBJECT friend class KttsJobMgrPart; public: - KttsJobMgrBrowserExtension(KttsJobMgrPart *tqparent); + KttsJobMgrBrowserExtension(KttsJobMgrPart *parent); virtual ~KttsJobMgrBrowserExtension(); }; diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index f4f2935..c1ce347 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -135,7 +135,7 @@ int main (int argc, char *argv[]) /* KttsToolTip class */ -KttsToolTip::KttsToolTip ( TQWidget* tqparent ) : TQToolTip(tqparent) +KttsToolTip::KttsToolTip ( TQWidget* parent ) : TQToolTip(parent) { } @@ -163,10 +163,10 @@ KttsToolTip::KttsToolTip ( TQWidget* tqparent ) : TQToolTip(tqparent) /* KttsMgrTray class */ -KttsMgrTray::KttsMgrTray(TQWidget *tqparent): +KttsMgrTray::KttsMgrTray(TQWidget *parent): DCOPStub("kttsd", "KSpeech"), DCOPObject("kkttsmgr_kspeechsink"), - KSystemTray(tqparent, "kttsmgrsystemtray") + KSystemTray(parent, "kttsmgrsystemtray") { TQPixmap icon = KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small); setPixmap (icon); @@ -200,7 +200,7 @@ KttsMgrTray::KttsMgrTray(TQWidget *tqparent): "textFinished(TQCString,uint)", false); // Install an event filter so we can check when KTTSMgr becomes inconified to the systray. - tqparent->installEventFilter(this); + parent->installEventFilter(this); } } diff --git a/kttsd/kttsmgr/kttsmgr.h b/kttsd/kttsmgr/kttsmgr.h index af7765c..a2a99df 100644 --- a/kttsd/kttsmgr/kttsmgr.h +++ b/kttsd/kttsmgr/kttsmgr.h @@ -39,7 +39,7 @@ class KttsToolTip: public TQToolTip { public: - KttsToolTip ( TQWidget* tqparent ); + KttsToolTip ( TQWidget* parent ); protected: virtual void maybeTip ( const TQPoint & p ); @@ -51,7 +51,7 @@ class KttsMgrTray: public KSystemTray, public KSpeech_stub, virtual public KSpee TQ_OBJECT public: - KttsMgrTray(TQWidget *tqparent=0); + KttsMgrTray(TQWidget *parent=0); ~KttsMgrTray(); void setExitWhenFinishedSpeaking(); diff --git a/kttsd/libkttsd/filterconf.cpp b/kttsd/libkttsd/filterconf.cpp index bfeb1f5..e98435c 100644 --- a/kttsd/libkttsd/filterconf.cpp +++ b/kttsd/libkttsd/filterconf.cpp @@ -42,7 +42,7 @@ /** * Constructor */ -KttsFilterConf::KttsFilterConf( TQWidget *tqparent, const char *name) : TQWidget(tqparent, name){ +KttsFilterConf::KttsFilterConf( TQWidget *parent, const char *name) : TQWidget(parent, name){ // kdDebug() << "KttsFilterConf::KttsFilterConf: Running" << endl; TQString systemPath(getenv("PATH")); // kdDebug() << "Path is " << systemPath << endl; diff --git a/kttsd/libkttsd/filterconf.h b/kttsd/libkttsd/filterconf.h index c508532..dc3023f 100644 --- a/kttsd/libkttsd/filterconf.h +++ b/kttsd/libkttsd/filterconf.h @@ -42,7 +42,7 @@ class KDE_EXPORT KttsFilterConf : public TQWidget{ /** * Constructor */ - KttsFilterConf( TQWidget *tqparent = 0, const char *name = 0); + KttsFilterConf( TQWidget *parent = 0, const char *name = 0); /** * Destructor diff --git a/kttsd/libkttsd/filterproc.cpp b/kttsd/libkttsd/filterproc.cpp index 9daf281..2759a4b 100644 --- a/kttsd/libkttsd/filterproc.cpp +++ b/kttsd/libkttsd/filterproc.cpp @@ -31,8 +31,8 @@ /** * Constructor. */ -KttsFilterProc::KttsFilterProc( TQObject *tqparent, const char *name) : - TQObject(tqparent, name) +KttsFilterProc::KttsFilterProc( TQObject *parent, const char *name) : + TQObject(parent, name) { // kdDebug() << "KttsFilterProc::KttsFilterProc: Running" << endl; } diff --git a/kttsd/libkttsd/filterproc.h b/kttsd/libkttsd/filterproc.h index 3484061..0c279fb 100644 --- a/kttsd/libkttsd/filterproc.h +++ b/kttsd/libkttsd/filterproc.h @@ -52,7 +52,7 @@ public: /** * Constructor. */ - KttsFilterProc( TQObject *tqparent, const char *name ); + KttsFilterProc( TQObject *parent, const char *name ); /** * Destructor. diff --git a/kttsd/libkttsd/player.h b/kttsd/libkttsd/player.h index a0b8311..2d391dc 100644 --- a/kttsd/libkttsd/player.h +++ b/kttsd/libkttsd/player.h @@ -67,8 +67,8 @@ public: virtual void setPeriods(uint periods) {Q_UNUSED(periods); } protected: - Player(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList() ) : - TQObject(tqparent, name) { + Player(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList() ) : + TQObject(parent, name) { Q_UNUSED(args); } diff --git a/kttsd/libkttsd/pluginconf.cpp b/kttsd/libkttsd/pluginconf.cpp index 8138547..ce68916 100644 --- a/kttsd/libkttsd/pluginconf.cpp +++ b/kttsd/libkttsd/pluginconf.cpp @@ -36,7 +36,7 @@ /** * Constructor */ -PlugInConf::PlugInConf( TQWidget *tqparent, const char *name) : TQWidget(tqparent, name){ +PlugInConf::PlugInConf( TQWidget *parent, const char *name) : TQWidget(parent, name){ kdDebug() << "PlugInConf::PlugInConf: Running" << endl; KGlobal::locale()->insertCatalogue("kttsd"); TQString systemPath(getenv("PATH")); diff --git a/kttsd/libkttsd/pluginconf.h b/kttsd/libkttsd/pluginconf.h index b76ec21..8758552 100644 --- a/kttsd/libkttsd/pluginconf.h +++ b/kttsd/libkttsd/pluginconf.h @@ -215,7 +215,7 @@ class KDE_EXPORT PlugInConf : public TQWidget{ /** * Constructor */ - PlugInConf( TQWidget *tqparent = 0, const char *name = 0); + PlugInConf( TQWidget *parent = 0, const char *name = 0); /** * Destructor diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp index 39c523b..bcd79fd 100644 --- a/kttsd/libkttsd/pluginproc.cpp +++ b/kttsd/libkttsd/pluginproc.cpp @@ -31,7 +31,7 @@ /** * Constructor */ -PlugInProc::PlugInProc( TQObject *tqparent, const char *name) : TQObject(tqparent, name){ +PlugInProc::PlugInProc( TQObject *parent, const char *name) : TQObject(parent, name){ // kdDebug() << "PlugInProc::PlugInProc: Running" << endl; } diff --git a/kttsd/libkttsd/pluginproc.h b/kttsd/libkttsd/pluginproc.h index ab156b3..2132e47 100644 --- a/kttsd/libkttsd/pluginproc.h +++ b/kttsd/libkttsd/pluginproc.h @@ -242,7 +242,7 @@ class KDE_EXPORT PlugInProc : virtual public TQObject{ /** * Constructor. */ - PlugInProc( TQObject *tqparent = 0, const char *name = 0); + PlugInProc( TQObject *parent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp index 99a2b03..c06c3ff 100644 --- a/kttsd/libkttsd/selecttalkerdlg.cpp +++ b/kttsd/libkttsd/selecttalkerdlg.cpp @@ -45,14 +45,14 @@ #include "selecttalkerdlg.moc" SelectTalkerDlg::SelectTalkerDlg( - TQWidget* tqparent, + TQWidget* parent, const char* name, const TQString& caption, const TQString& talkerCode, bool runningTalkers) : KDialogBase( - tqparent, + parent, name, true, caption, diff --git a/kttsd/libkttsd/selecttalkerdlg.h b/kttsd/libkttsd/selecttalkerdlg.h index 2ac7c30..d7b0021 100644 --- a/kttsd/libkttsd/selecttalkerdlg.h +++ b/kttsd/libkttsd/selecttalkerdlg.h @@ -47,7 +47,7 @@ class KDE_EXPORT SelectTalkerDlg : public KDialogBase public: /** * Constructor. - * @param tqparent The tqparent for this dialog. + * @param parent The parent for this dialog. * @param name Name for this dialog. * @param caption Displayed title for this dialog. * @param talkerCode A suggested starting Talker Code. @@ -56,7 +56,7 @@ class KDE_EXPORT SelectTalkerDlg : public KDialogBase * (which may not yet have been Applied). */ SelectTalkerDlg( - TQWidget* tqparent = 0, + TQWidget* parent = 0, const char* name = "selecttalkerdialog", const TQString& caption = i18n("Select Talker"), const TQString& talkerCode = TQString(), diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp index 14f0b83..6af8baf 100644 --- a/kttsd/libkttsd/stretcher.cpp +++ b/kttsd/libkttsd/stretcher.cpp @@ -34,8 +34,8 @@ /** * Constructor. */ -Stretcher::Stretcher(TQObject *tqparent, const char *name) : - TQObject(tqparent, name) +Stretcher::Stretcher(TQObject *parent, const char *name) : + TQObject(parent, name) { m_state = 0; m_stretchProc = 0; diff --git a/kttsd/libkttsd/stretcher.h b/kttsd/libkttsd/stretcher.h index e0c7e72..dc85e46 100644 --- a/kttsd/libkttsd/stretcher.h +++ b/kttsd/libkttsd/stretcher.h @@ -39,7 +39,7 @@ class KDE_EXPORT Stretcher : public TQObject{ /** * Constructor. */ - Stretcher(TQObject *tqparent = 0, const char *name = 0); + Stretcher(TQObject *parent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp index 155f2aa..70ca3eb 100644 --- a/kttsd/libkttsd/testplayer.cpp +++ b/kttsd/libkttsd/testplayer.cpp @@ -44,9 +44,9 @@ /** * Constructor. */ -TestPlayer::TestPlayer(TQObject *tqparent, const char *name, +TestPlayer::TestPlayer(TQObject *parent, const char *name, const int playerOption, const float audioStretchFactor, const TQString &sinkName) : - TQObject(tqparent, name) + TQObject(parent, name) { m_playerOption = playerOption; m_audioStretchFactor = audioStretchFactor; diff --git a/kttsd/libkttsd/testplayer.h b/kttsd/libkttsd/testplayer.h index c95c369..b11d6cb 100644 --- a/kttsd/libkttsd/testplayer.h +++ b/kttsd/libkttsd/testplayer.h @@ -40,7 +40,7 @@ class KDE_EXPORT TestPlayer : public TQObject{ * @param playerOption * @param audioStretchFactor */ - TestPlayer(TQObject *tqparent = 0, const char *name = 0, + TestPlayer(TQObject *parent = 0, const char *name = 0, const int playerOption = 0, const float audioStretchFactor = 1.0, const TQString &sinkName = TQString()); diff --git a/kttsd/players/akodeplayer/akodeplayer.cpp b/kttsd/players/akodeplayer/akodeplayer.cpp index a0d38bb..13f6cf3 100644 --- a/kttsd/players/akodeplayer/akodeplayer.cpp +++ b/kttsd/players/akodeplayer/akodeplayer.cpp @@ -29,8 +29,8 @@ using namespace aKode; // public methods //////////////////////////////////////////////////////////////////////////////// -aKodePlayer::aKodePlayer(TQObject* tqparent, const char* name, const TQStringList& args) : - Player(tqparent, name, args), +aKodePlayer::aKodePlayer(TQObject* parent, const char* name, const TQStringList& args) : + Player(parent, name, args), m_player(0) {} diff --git a/kttsd/players/akodeplayer/akodeplayer.h b/kttsd/players/akodeplayer/akodeplayer.h index 13fe8de..c5d1c69 100644 --- a/kttsd/players/akodeplayer/akodeplayer.h +++ b/kttsd/players/akodeplayer/akodeplayer.h @@ -34,7 +34,7 @@ class KDE_EXPORT aKodePlayer : public Player TQ_OBJECT public: - aKodePlayer(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + aKodePlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); virtual ~aKodePlayer(); // virtual void play(const FileHandle &file = FileHandle::null()); diff --git a/kttsd/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp index 5c435d8..fbec8aa 100644 --- a/kttsd/players/alsaplayer/alsaplayer.cpp +++ b/kttsd/players/alsaplayer/alsaplayer.cpp @@ -128,8 +128,8 @@ TQString AlsaPlayer::timestamp() const // public methods //////////////////////////////////////////////////////////////////////////////// -AlsaPlayer::AlsaPlayer(TQObject* tqparent, const char* name, const TQStringList& args) : - Player(tqparent, name, args), +AlsaPlayer::AlsaPlayer(TQObject* parent, const char* name, const TQStringList& args) : + Player(parent, name, args), m_currentVolume(1.0), m_pcmName("default"), m_defPeriodSize(128), diff --git a/kttsd/players/alsaplayer/alsaplayer.h b/kttsd/players/alsaplayer/alsaplayer.h index 7dedc87..1d25cec 100644 --- a/kttsd/players/alsaplayer/alsaplayer.h +++ b/kttsd/players/alsaplayer/alsaplayer.h @@ -69,7 +69,7 @@ class KDE_EXPORT AlsaPlayer : public Player, TQThread TQ_OBJECT public: - AlsaPlayer(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + AlsaPlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); ~AlsaPlayer(); virtual void startPlay(const TQString& file); diff --git a/kttsd/players/artsplayer/artsplayer.cpp b/kttsd/players/artsplayer/artsplayer.cpp index 63652de..7f80691 100644 --- a/kttsd/players/artsplayer/artsplayer.cpp +++ b/kttsd/players/artsplayer/artsplayer.cpp @@ -40,8 +40,8 @@ // public methods //////////////////////////////////////////////////////////////////////////////// -ArtsPlayer::ArtsPlayer(TQObject* tqparent, const char* name, const TQStringList& args) : - Player(tqparent, name, args), +ArtsPlayer::ArtsPlayer(TQObject* parent, const char* name, const TQStringList& args) : + Player(parent, name, args), m_dispatcher(0), m_server(0), m_factory(0), diff --git a/kttsd/players/artsplayer/artsplayer.h b/kttsd/players/artsplayer/artsplayer.h index 307999a..971c56d 100644 --- a/kttsd/players/artsplayer/artsplayer.h +++ b/kttsd/players/artsplayer/artsplayer.h @@ -46,7 +46,7 @@ class KDE_EXPORT ArtsPlayer : public Player TQ_OBJECT public: - ArtsPlayer(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + ArtsPlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); ~ArtsPlayer(); // virtual void play(const FileHandle &file = FileHandle::null()); diff --git a/kttsd/players/gstplayer/gstreamerplayer.cpp b/kttsd/players/gstplayer/gstreamerplayer.cpp index ae06557..bfd62d0 100644 --- a/kttsd/players/gstplayer/gstreamerplayer.cpp +++ b/kttsd/players/gstplayer/gstreamerplayer.cpp @@ -29,8 +29,8 @@ // public methods //////////////////////////////////////////////////////////////////////////////// -GStreamerPlayer::GStreamerPlayer(TQObject* tqparent, const char* name, const TQStringList& args) : - Player(tqparent, name, args), +GStreamerPlayer::GStreamerPlayer(TQObject* parent, const char* name, const TQStringList& args) : + Player(parent, name, args), m_initialized(false), m_pipeline(0), m_source(0), diff --git a/kttsd/players/gstplayer/gstreamerplayer.h b/kttsd/players/gstplayer/gstreamerplayer.h index 066b493..14a054a 100644 --- a/kttsd/players/gstplayer/gstreamerplayer.h +++ b/kttsd/players/gstplayer/gstreamerplayer.h @@ -31,7 +31,7 @@ class GStreamerPlayer : public Player TQ_OBJECT public: - GStreamerPlayer(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + GStreamerPlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); virtual ~GStreamerPlayer(); // virtual void play(const FileHandle &file = FileHandle::null()); diff --git a/kttsd/plugins/command/commandconf.cpp b/kttsd/plugins/command/commandconf.cpp index 968c20d..9045f14 100644 --- a/kttsd/plugins/command/commandconf.cpp +++ b/kttsd/plugins/command/commandconf.cpp @@ -41,8 +41,8 @@ #include "commandconf.h" /** Constructor */ -CommandConf::CommandConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInConf(tqparent, name) +CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : + PlugInConf(parent, name) { // kdDebug() << "CommandConf::CommandConf: Running" << endl; m_commandProc = 0; diff --git a/kttsd/plugins/command/commandconf.h b/kttsd/plugins/command/commandconf.h index 4607718..2ab9810 100644 --- a/kttsd/plugins/command/commandconf.h +++ b/kttsd/plugins/command/commandconf.h @@ -40,7 +40,7 @@ class CommandConf : public PlugInConf { public: /** Constructor */ - CommandConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + CommandConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~CommandConf(); diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp index d8b35d2..d1eb223 100644 --- a/kttsd/plugins/command/commandproc.cpp +++ b/kttsd/plugins/command/commandproc.cpp @@ -39,8 +39,8 @@ #include "commandproc.moc" /** Constructor */ -CommandProc::CommandProc( TQObject* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInProc( tqparent, name ) +CommandProc::CommandProc( TQObject* parent, const char* name, const TQStringList& /*args*/) : + PlugInProc( parent, name ) { kdDebug() << "CommandProc::CommandProc: Running" << endl; m_commandProc = 0; diff --git a/kttsd/plugins/command/commandproc.h b/kttsd/plugins/command/commandproc.h index 0faf1f4..71eb8be 100644 --- a/kttsd/plugins/command/commandproc.h +++ b/kttsd/plugins/command/commandproc.h @@ -33,7 +33,7 @@ class CommandProc : public PlugInProc{ public: /** Constructor */ - CommandProc( TQObject* tqparent = 0, const char* name = 0, + CommandProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ diff --git a/kttsd/plugins/epos/eposconf.cpp b/kttsd/plugins/epos/eposconf.cpp index b3cd27d..a755ac8 100644 --- a/kttsd/plugins/epos/eposconf.cpp +++ b/kttsd/plugins/epos/eposconf.cpp @@ -48,8 +48,8 @@ #include "eposconf.moc" /** Constructor */ -EposConf::EposConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInConf(tqparent, name) +EposConf::EposConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : + PlugInConf(parent, name) { // kdDebug() << "EposConf::EposConf: Running" << endl; m_eposProc = 0; diff --git a/kttsd/plugins/epos/eposconf.h b/kttsd/plugins/epos/eposconf.h index 667d445..bfbe346 100644 --- a/kttsd/plugins/epos/eposconf.h +++ b/kttsd/plugins/epos/eposconf.h @@ -47,7 +47,7 @@ class EposConf : public PlugInConf { public: /** Constructor */ - EposConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + EposConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~EposConf(); diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp index ae7973c..670a1c4 100644 --- a/kttsd/plugins/epos/eposproc.cpp +++ b/kttsd/plugins/epos/eposproc.cpp @@ -43,8 +43,8 @@ #include "eposproc.moc" /** Constructor */ -EposProc::EposProc( TQObject* tqparent, const char* name, const TQStringList& ) : - PlugInProc( tqparent, name ){ +EposProc::EposProc( TQObject* parent, const char* name, const TQStringList& ) : + PlugInProc( parent, name ){ kdDebug() << "EposProc::EposProc: Running" << endl; m_state = psIdle; m_waitingStop = false; diff --git a/kttsd/plugins/epos/eposproc.h b/kttsd/plugins/epos/eposproc.h index 0689481..e0fe6d3 100644 --- a/kttsd/plugins/epos/eposproc.h +++ b/kttsd/plugins/epos/eposproc.h @@ -43,7 +43,7 @@ class EposProc : public PlugInProc{ /** * Constructor */ - EposProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + EposProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp index 54542ab..10a3ad9 100644 --- a/kttsd/plugins/festivalint/festivalintconf.cpp +++ b/kttsd/plugins/festivalint/festivalintconf.cpp @@ -57,8 +57,8 @@ #include "festivalintconf.moc" /** Constructor */ -FestivalIntConf::FestivalIntConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInConf(tqparent, name) +FestivalIntConf::FestivalIntConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : + PlugInConf(parent, name) { // kdDebug() << "FestivalIntConf::FestivalIntConf: Running" << endl; m_festProc = 0; diff --git a/kttsd/plugins/festivalint/festivalintconf.h b/kttsd/plugins/festivalint/festivalintconf.h index 3379719..9af75c2 100644 --- a/kttsd/plugins/festivalint/festivalintconf.h +++ b/kttsd/plugins/festivalint/festivalintconf.h @@ -60,7 +60,7 @@ class FestivalIntConf : public PlugInConf { public: /** Constructor */ - FestivalIntConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FestivalIntConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FestivalIntConf(); diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp index bc37d1e..6e3a9f3 100644 --- a/kttsd/plugins/festivalint/festivalintproc.cpp +++ b/kttsd/plugins/festivalint/festivalintproc.cpp @@ -43,8 +43,8 @@ #include "festivalintproc.moc" /** Constructor */ -FestivalIntProc::FestivalIntProc( TQObject* tqparent, const char* name, const TQStringList& ) : - PlugInProc( tqparent, name ){ +FestivalIntProc::FestivalIntProc( TQObject* parent, const char* name, const TQStringList& ) : + PlugInProc( parent, name ){ // kdDebug() << "FestivalIntProc::FestivalIntProc: Running" << endl; m_ready = true; m_writingStdin = false; diff --git a/kttsd/plugins/festivalint/festivalintproc.h b/kttsd/plugins/festivalint/festivalintproc.h index e70127f..71fe6e4 100644 --- a/kttsd/plugins/festivalint/festivalintproc.h +++ b/kttsd/plugins/festivalint/festivalintproc.h @@ -47,7 +47,7 @@ class FestivalIntProc : public PlugInProc{ /** * Constructor */ - FestivalIntProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FestivalIntProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/flite/fliteconf.cpp b/kttsd/plugins/flite/fliteconf.cpp index 060e45c..076fcb0 100644 --- a/kttsd/plugins/flite/fliteconf.cpp +++ b/kttsd/plugins/flite/fliteconf.cpp @@ -42,8 +42,8 @@ #include "fliteconf.moc" /** Constructor */ -FliteConf::FliteConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInConf(tqparent, name) +FliteConf::FliteConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : + PlugInConf(parent, name) { // kdDebug() << "FliteConf::FliteConf: Running" << endl; m_fliteProc = 0; diff --git a/kttsd/plugins/flite/fliteconf.h b/kttsd/plugins/flite/fliteconf.h index 75e3b89..ca84926 100644 --- a/kttsd/plugins/flite/fliteconf.h +++ b/kttsd/plugins/flite/fliteconf.h @@ -46,7 +46,7 @@ class FliteConf : public PlugInConf { public: /** Constructor */ - FliteConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FliteConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FliteConf(); diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp index e8185d5..238cf26 100644 --- a/kttsd/plugins/flite/fliteproc.cpp +++ b/kttsd/plugins/flite/fliteproc.cpp @@ -36,8 +36,8 @@ #include "fliteproc.moc" /** Constructor */ -FliteProc::FliteProc( TQObject* tqparent, const char* name, const TQStringList& ) : - PlugInProc( tqparent, name ){ +FliteProc::FliteProc( TQObject* parent, const char* name, const TQStringList& ) : + PlugInProc( parent, name ){ kdDebug() << "FliteProc::FliteProc: Running" << endl; m_state = psIdle; m_waitingStop = false; diff --git a/kttsd/plugins/flite/fliteproc.h b/kttsd/plugins/flite/fliteproc.h index 6b44e45..00d9c51 100644 --- a/kttsd/plugins/flite/fliteproc.h +++ b/kttsd/plugins/flite/fliteproc.h @@ -41,7 +41,7 @@ class FliteProc : public PlugInProc{ /** * Constructor */ - FliteProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FliteProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/freetts/freettsconf.cpp b/kttsd/plugins/freetts/freettsconf.cpp index 1da6f44..87f12b4 100644 --- a/kttsd/plugins/freetts/freettsconf.cpp +++ b/kttsd/plugins/freetts/freettsconf.cpp @@ -40,8 +40,8 @@ #include "freettsconfigwidget.h" /** Constructor */ -FreeTTSConf::FreeTTSConf( TQWidget* tqparent, const char* name, const TQStringList&/*args*/) : - PlugInConf( tqparent, name ) { +FreeTTSConf::FreeTTSConf( TQWidget* parent, const char* name, const TQStringList&/*args*/) : + PlugInConf( parent, name ) { // kdDebug() << "FreeTTSConf::FreeTTSConf: Running" << endl; m_freettsProc = 0; diff --git a/kttsd/plugins/freetts/freettsconf.h b/kttsd/plugins/freetts/freettsconf.h index 62e2e7a..7095da5 100644 --- a/kttsd/plugins/freetts/freettsconf.h +++ b/kttsd/plugins/freetts/freettsconf.h @@ -37,7 +37,7 @@ class FreeTTSConf : public PlugInConf { public: /** Constructor */ - FreeTTSConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FreeTTSConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FreeTTSConf(); diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp index c3de342..e99cd73 100644 --- a/kttsd/plugins/freetts/freettsproc.cpp +++ b/kttsd/plugins/freetts/freettsproc.cpp @@ -27,8 +27,8 @@ #include "freettsproc.h" /** Constructor */ -FreeTTSProc::FreeTTSProc( TQObject* tqparent, const char* name, const TQStringList& /*args*/) : - PlugInProc( tqparent, name ) { +FreeTTSProc::FreeTTSProc( TQObject* parent, const char* name, const TQStringList& /*args*/) : + PlugInProc( parent, name ) { kdDebug() << "Running: FreeTTSProc::FreeTTSProc" << endl; m_state = psIdle; m_waitingStop = false; diff --git a/kttsd/plugins/freetts/freettsproc.h b/kttsd/plugins/freetts/freettsproc.h index 15ad5f5..8383f53 100644 --- a/kttsd/plugins/freetts/freettsproc.h +++ b/kttsd/plugins/freetts/freettsproc.h @@ -34,7 +34,7 @@ public: /** * Constructor */ - FreeTTSProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FreeTTSProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp index 1d4a2cc..798455c 100644 --- a/kttsd/plugins/hadifix/hadifixconf.cpp +++ b/kttsd/plugins/hadifix/hadifixconf.cpp @@ -203,8 +203,8 @@ class HadifixConfPrivate { }; /** Constructor */ -HadifixConf::HadifixConf( TQWidget* tqparent, const char* name, const TQStringList &) : - PlugInConf( tqparent, name ){ +HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList &) : + PlugInConf( parent, name ){ // kdDebug() << "HadifixConf::HadifixConf: Running" << endl; TQVBoxLayout *tqlayout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout"); tqlayout->tqsetAlignment (TQt::AlignTop); diff --git a/kttsd/plugins/hadifix/hadifixconf.h b/kttsd/plugins/hadifix/hadifixconf.h index 7eb7b30..8f56126 100644 --- a/kttsd/plugins/hadifix/hadifixconf.h +++ b/kttsd/plugins/hadifix/hadifixconf.h @@ -16,7 +16,7 @@ class HadifixConf : public PlugInConf { public: /** Constructor */ - HadifixConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + HadifixConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~HadifixConf(); diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp index ad2cf21..4c3f85f 100644 --- a/kttsd/plugins/hadifix/hadifixproc.cpp +++ b/kttsd/plugins/hadifix/hadifixproc.cpp @@ -75,8 +75,8 @@ class HadifixProcPrivate { }; /** Constructor */ -HadifixProc::HadifixProc( TQObject* tqparent, const char* name, const TQStringList &) : - PlugInProc( tqparent, name ){ +HadifixProc::HadifixProc( TQObject* parent, const char* name, const TQStringList &) : + PlugInProc( parent, name ){ // kdDebug() << "HadifixProc::HadifixProc: Running" << endl; d = 0; } diff --git a/kttsd/plugins/hadifix/hadifixproc.h b/kttsd/plugins/hadifix/hadifixproc.h index 4fbf03b..b26e2df 100644 --- a/kttsd/plugins/hadifix/hadifixproc.h +++ b/kttsd/plugins/hadifix/hadifixproc.h @@ -38,7 +38,7 @@ class HadifixProc : public PlugInProc{ }; /** Constructor */ - HadifixProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + HadifixProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~HadifixProc(); |