diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-17 22:17:08 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-06-17 22:17:08 +0000 |
| commit | f138d74fe16092003b06f5bde9663841929cde7f (patch) | |
| tree | e9c497a0e59bc7d34264ac9404740d2ea76f3de4 | |
| parent | 3a3c4b256baee79bdcfe72c5e01b9ded9b525900 (diff) | |
| download | tdeaccessibility-f138d74fe16092003b06f5bde9663841929cde7f.tar.gz tdeaccessibility-f138d74fe16092003b06f5bde9663841929cde7f.zip | |
TQt4 port kdeaccessibility
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaccessibility@1237325 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
234 files changed, 2601 insertions, 2527 deletions
diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 09f6846..69a7809 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 *parent, const TQString& configFile) + KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile) { KGlobal::locale()->insertCatalogue("kbstateapplet"); - KbStateApplet *applet = new KbStateApplet(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "kbstateapplet"); + KbStateApplet *applet = new KbStateApplet(configFile, KPanelApplet::Normal, KPanelApplet::About, tqparent, "kbstateapplet"); return applet; } } struct ModifierKey { - const unsigned int mask; + const unsigned int tqmask; 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 *parent, const char *name) - : KPanelApplet( configFile, t, actions, parent, name ) + TQWidget *tqparent, const char *name) + : KPanelApplet( configFile, t, actions, tqparent, name ) { for (int i = 0; i < 8; i++) { icons[i] = 0; @@ -145,12 +145,12 @@ void KbStateApplet::buildPopupMenu() showPopup->setCheckable( true ); modifierItem=showPopup->insertItem(i18n("Modifier Keys"), this, TQT_SLOT(toggleModifier())); lockkeysItem=showPopup->insertItem(i18n("Lock Keys"), this, TQT_SLOT(toggleLockkeys())); - mouseItem=showPopup->insertItem(i18n("Mouse Status"), this, TQT_SLOT(toggleMouse())); - accessxItem=showPopup->insertItem(i18n("AccessX Status"), this, TQT_SLOT(toggleAccessX())); + mouseItem=showPopup->insertItem(i18n("Mouse tqStatus"), this, TQT_SLOT(toggleMouse())); + accessxItem=showPopup->insertItem(i18n("AccessX tqStatus"), this, TQT_SLOT(toggleAccessX())); popup = new KPopupMenu(this); popup->setCheckable( true ); - popup->insertTitle(0, i18n("Keyboard Status Applet")); + popup->insertTitle(0, i18n("Keyboard tqStatus Applet")); popup->insertItem(i18n("Set Icon Size"),sizePopup); fillSpaceItem = popup->insertItem(i18n("Fill Available Space"), this, TQT_SLOT(toggleFillSpace())); @@ -179,7 +179,7 @@ void KbStateApplet::updateMenu() void calculateSizes (int space, int modifiers, int lockkeys, int accessx, bool showMouse, int &lines, int &length, int &size) -// Calculates the layout based on a given number of modifiers, lockkeys and +// Calculates the tqlayout based on a given number of modifiers, lockkeys and // accessx features. // Output: // lines: number of lines @@ -264,7 +264,7 @@ int KbStateApplet::heightForWidth(int w) const { } void KbStateApplet::mousePressEvent(TQMouseEvent *e) { - if (e->button() == RightButton) + if (e->button() == Qt::RightButton) popup->popup(e->globalPos()); } @@ -281,17 +281,17 @@ void KbStateApplet::toggleFillSpace() { fillSpace = !fillSpace; saveConfig(); updateMenu(); - layout(); + tqlayout(); updateGeometry(); emit updateLayout(); } void KbStateApplet::resizeEvent( TQResizeEvent*e ) { TQWidget::resizeEvent(e); - layout(); + tqlayout(); } -void KbStateApplet::layout() { +void KbStateApplet::tqlayout() { int size = this->size; int lines, length, x,y,dx,dy, ldx,ldy; @@ -308,7 +308,7 @@ void KbStateApplet::layout() { accessxCount++; } - if (orientation() == Vertical) { + if (orientation() ==Qt::Vertical) { calculateSizes (width(), modifierCount, lockkeyCount, accessxCount, showMouse, lines, length, size); @@ -527,21 +527,21 @@ void KbStateApplet::initMasks() { state = 0; for (int i = 0; strcmp(modifierKeys[i].name, "") != 0; i++) { - int mask = modifierKeys[i].mask; - if (mask == 0) + int tqmask = modifierKeys[i].tqmask; + if (tqmask == 0) if (modifierKeys[i].keysym != 0) - mask = XkbKeysymToModifiers (this->x11Display(), modifierKeys[i].keysym); + tqmask = XkbKeysymToModifiers (this->x11Display(), modifierKeys[i].keysym); else if (!strcmp(modifierKeys[i].name, "Win")) - mask = KKeyNative::modX(KKey::WIN); + tqmask = KKeyNative::modX(KKey::WIN); else - mask = XkbKeysymToModifiers (this->x11Display(), XK_Mode_switch) + tqmask = 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 ((mask & (1 << map)) != 0) + if ((tqmask & (1 << map)) != 0) break; } if ((map <= 7) && !(icons[map])) { @@ -608,7 +608,7 @@ bool KbStateApplet::x11Event (XEvent *evt) { else mouse->setActiveKey (0); - layout(); + tqlayout(); updateGeometry(); emit updateLayout(); break; @@ -660,7 +660,7 @@ void KbStateApplet::stateChangeRequest (KeyIcon *source, bool latched, bool lock void KbStateApplet::toggleModifier() { showModifiers = !showModifiers; updateMenu(); - layout(); + tqlayout(); updateGeometry(); saveConfig(); emit updateLayout(); @@ -669,7 +669,7 @@ void KbStateApplet::toggleModifier() { void KbStateApplet::toggleLockkeys() { showLockkeys = !showLockkeys; updateMenu(); - layout(); + tqlayout(); updateGeometry(); saveConfig(); emit updateLayout(); @@ -678,7 +678,7 @@ void KbStateApplet::toggleLockkeys() { void KbStateApplet::toggleMouse() { showMouse = !showMouse; updateMenu(); - layout(); + tqlayout(); updateGeometry(); saveConfig(); emit updateLayout(); @@ -687,7 +687,7 @@ void KbStateApplet::toggleMouse() { void KbStateApplet::toggleAccessX() { showAccessX = !showAccessX; updateMenu(); - layout(); + tqlayout(); updateGeometry(); saveConfig(); emit updateLayout(); @@ -712,7 +712,7 @@ void KbStateApplet::configureMouse() { } void KbStateApplet::about() { - KAboutData about("kbstateapplet", I18N_NOOP("Keyboard Status Applet"), "0.2", + KAboutData about("kbstateapplet", I18N_NOOP("Keyboard tqStatus Applet"), "0.2", I18N_NOOP("Panel applet that shows the state of the modifier keys"), KAboutData::License_GPL_V2, "(C) 2004 Gunnar Schmi Dt"); KAboutApplication a(&about, this); a.exec(); @@ -747,8 +747,8 @@ void KbStateApplet::saveConfig() /********************************************************************/ KeyIcon::KeyIcon (int keyId, KInstance *instance, - TQWidget *parent, const char *name) - : StatusIcon (modifierKeys[keyId].name, parent, name) { + TQWidget *tqparent, const char *name) + : StatusIcon (modifierKeys[keyId].name, tqparent, name) { this->instance = instance; this->keyId = keyId; this->tristate = (modifierKeys[keyId].isModifier); @@ -810,7 +810,7 @@ void KeyIcon::drawButton (TQPainter *p) { int y = (height()-locked.height())/2; int o = 0; if (isLocked || isLatched) { - qDrawShadePanel (p, 0, 0, width(), height(), colorGroup(), true, 1, NULL); + qDrawShadePanel (p, 0, 0, width(), height(), tqcolorGroup(), true, 1, NULL); p->fillRect (1,1,width()-2,height()-2, KGlobalSettings::highlightColor()); if (strcmp(modifierKeys[keyId].icon, "")) p->drawPixmap (x+1,y+1, latched); @@ -818,7 +818,7 @@ void KeyIcon::drawButton (TQPainter *p) { o = 1; } else { - qDrawShadePanel (p, 0, 0, width(), height(), colorGroup(), false, 1, NULL); + qDrawShadePanel (p, 0, 0, width(), height(), tqcolorGroup(), false, 1, NULL); if (strcmp(modifierKeys[keyId].icon, "")) p->drawPixmap (x,y, unlatched); black = KGlobalSettings::textColor(); @@ -844,9 +844,9 @@ void KeyIcon::drawButton (TQPainter *p) { p->setPen (black); p->setFont (font); if (!strcmp(modifierKeys[keyId].name, "Alt Graph")) - p->drawText (o,o, width(), height(), Qt::AlignCenter, text); + p->drawText (o,o, width(), height(), TQt::AlignCenter, text); else - p->drawText (o,o, width(), height()*(251)/384, Qt::AlignCenter, text); + p->drawText (o,o, width(), height()*(251)/384, TQt::AlignCenter, text); } if (tristate && isLocked) { p->drawPixmap(x+o,y+o, locked); @@ -855,8 +855,8 @@ void KeyIcon::drawButton (TQPainter *p) { /********************************************************************/ -MouseIcon::MouseIcon (KInstance *instance, TQWidget *parent, const char *name) - : StatusIcon ("", parent, name) +MouseIcon::MouseIcon (KInstance *instance, TQWidget *tqparent, const char *name) + : StatusIcon ("", tqparent, 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 *parent, const char *name) - : StatusIcon (text, parent, name) { + TQWidget *tqparent, const char *name) + : StatusIcon (text, tqparent, name) { this->instance = instance; this->featurename = featurename; glyth = " "; @@ -1046,7 +1046,7 @@ void TimeoutIcon::drawButton (TQPainter *p) { p->setFont (font); if (count == 1) { p->setPen (KGlobalSettings::textColor()); - p->drawText (0,0, width()/2, height()/2, Qt::AlignCenter, text); + p->drawText (0,0, width()/2, height()/2, TQt::AlignCenter, text); } else { TQColor t = KGlobalSettings::textColor(); @@ -1054,26 +1054,26 @@ void TimeoutIcon::drawButton (TQPainter *p) { p->setPen (TQColor ((2*t.red()+3*b.red())/5, (2*t.green()+3*b.green())/5, (2*t.blue()+3*b.blue())/5)); - p->drawText (width()/2,0, width()/2, height(), Qt::AlignCenter, text); + p->drawText (width()/2,0, width()/2, height(), TQt::AlignCenter, text); p->setPen (TQColor ((2*t.red()+b.red())/3, (2*t.green()+b.green())/3, (2*t.blue()+b.blue())/3)); - p->drawText (0,0, width(), height(), Qt::AlignCenter, text); + p->drawText (0,0, width(), height(), TQt::AlignCenter, text); p->setPen (KGlobalSettings::textColor()); - p->drawText (0,0, width()/2, height(), Qt::AlignCenter, text); + p->drawText (0,0, width()/2, height(), TQt::AlignCenter, text); } } /********************************************************************/ -StatusIcon::StatusIcon (const TQString &text, TQWidget *parent, const char *name) - : TQPushButton (text, parent, name) { - setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored)); +StatusIcon::StatusIcon (const TQString &text, TQWidget *tqparent, const char *name) + : TQPushButton (text, tqparent, name) { + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored)); } StatusIcon::~StatusIcon () { } -TQSize StatusIcon::minimumSizeHint () const { +TQSize StatusIcon::tqminimumSizeHint () const { return TQSize (0,0); } diff --git a/kbstateapplet/kbstate.h b/kbstateapplet/kbstate.h index a9b9601..55aca27 100644 --- a/kbstateapplet/kbstate.h +++ b/kbstateapplet/kbstate.h @@ -35,20 +35,22 @@ class KPopupMenu; class StatusIcon : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - StatusIcon (const TQString &text, TQWidget *parent, const char *name=0); + StatusIcon (const TQString &text, TQWidget *tqparent, const char *name=0); ~StatusIcon (); - TQSize minimumSizeHint () const; + TQSize tqminimumSizeHint () const; }; typedef TQPtrList<StatusIcon> IconList; class TimeoutIcon : public StatusIcon { Q_OBJECT + TQ_OBJECT public: TimeoutIcon (KInstance *instance, const TQString &text, const TQString &featurename, - TQWidget *parent, const char *name=0); + TQWidget *tqparent, const char *name=0); ~TimeoutIcon (); void update (); @@ -72,9 +74,10 @@ private slots: class KeyIcon : public StatusIcon { Q_OBJECT + TQ_OBJECT public: KeyIcon (int keyId, KInstance *instance, - TQWidget *parent, const char *name=0); + TQWidget *tqparent, const char *name=0); ~KeyIcon (); void setState (bool latched, bool locked); void drawButton (TQPainter *p); @@ -102,8 +105,9 @@ private: class MouseIcon : public StatusIcon { Q_OBJECT + TQ_OBJECT public: - MouseIcon (KInstance *instance, TQWidget *parent, const char *name=0); + MouseIcon (KInstance *instance, TQWidget *tqparent, const char *name=0); ~MouseIcon (); void setState (int state); void setActiveKey (int activekey); @@ -130,10 +134,11 @@ class MouseIcon : public StatusIcon { class KbStateApplet : public KPanelApplet { Q_OBJECT + TQ_OBJECT public: KbStateApplet(const TQString& configFile, Type t = Normal, int actions = 0, - TQWidget *parent = 0, const char *name = 0); + TQWidget *tqparent = 0, const char *name = 0); ~KbStateApplet(); int widthForHeight(int height) const; @@ -165,7 +170,7 @@ private slots: private: void loadConfig(); void saveConfig(); - void layout(); + void tqlayout(); int xkb_base_event_type; diff --git a/kmag/kmag.cpp b/kmag/kmag.cpp index 12d660c..80549be 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -126,92 +126,92 @@ KmagApp::~KmagApp() void KmagApp::initActions() { - fileNewWindow = new KAction(i18n("New &Window"), "window_new", KStdAccel::openNew(), this, + fileNewWindow = new KAction(i18n("New &Window"), "window_new", KStdAccel::openNew(), TQT_TQOBJECT(this), TQT_SLOT(slotFileNewWindow()), actionCollection(),"new_window"); fileNewWindow->setToolTip(i18n("Open a new KMagnifier window")); - refreshSwitch = new KAction(i18n("&Stop"), "stop", KStdAccel::reload(), this, + refreshSwitch = new KAction(i18n("&Stop"), "stop", KStdAccel::reload(), TQT_TQOBJECT(this), TQT_SLOT(slotToggleRefresh()), actionCollection(), "start_stop_refresh"); refreshSwitch->setToolTip(i18n("Click to stop window refresh")); refreshSwitch->setWhatsThis(i18n("Clicking on this icon will <b>start</b> / <b>stop</b>\ updating of the display. Stopping the update will zero the processing power\ required (CPU usage)")); - m_pSnapshot = new KAction(i18n("&Save Snapshot As..."), "ksnapshot", KStdAccel::save(), this, + m_pSnapshot = new KAction(i18n("&Save Snapshot As..."), "ksnapshot", KStdAccel::save(), TQT_TQOBJECT(this), TQT_SLOT(saveZoomPixmap()), actionCollection(),"snapshot"); m_pSnapshot->setWhatsThis(i18n("Saves the zoomed view to an image file.")); m_pSnapshot->setToolTip(i18n("Save image to a file")); - m_pPrint = KStdAction::print(this, TQT_SLOT(slotFilePrint()), actionCollection(), "print"); + m_pPrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection(), "print"); m_pPrint->setWhatsThis(i18n("Click on this button to print the current zoomed view.")); - m_pQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection(), "quit"); + m_pQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection(), "quit"); m_pQuit->setStatusText(i18n("Quits the application")); m_pQuit->setWhatsThis (i18n("Quits the application")); - m_pCopy = KStdAction::copy(this, TQT_SLOT(copyToClipBoard()), actionCollection(), "copy"); + m_pCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(copyToClipBoard()), actionCollection(), "copy"); m_pCopy->setWhatsThis(i18n("Click on this button to copy the current zoomed view to the clipboard which you can paste in other applications.")); m_pCopy->setToolTip(i18n("Copy zoomed image to clipboard")); - m_pShowMenu = new KToggleAction(i18n("Show &Menu"), "showmenu", CTRL+Key_M, this, + m_pShowMenu = new KToggleAction(i18n("Show &Menu"), "showmenu", CTRL+Key_M, TQT_TQOBJECT(this), TQT_SLOT(slotShowMenu()), actionCollection(),"show_menu"); #ifdef havesetCheckedState m_pShowMenu->setCheckedState(i18n("Hide &Menu")); #endif - m_pShowMainToolBar = new KToggleAction(i18n("Show Main &Toolbar"), 0, 0, this, + m_pShowMainToolBar = new KToggleAction(i18n("Show Main &Toolbar"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowMainToolBar()), actionCollection(),"show_mainToolBar"); #ifdef havesetCheckedState m_pShowMainToolBar->setCheckedState(i18n("Hide Main &Toolbar")); #endif - m_pShowViewToolBar = new KToggleAction(i18n("Show &View Toolbar"), 0, 0, this, + m_pShowViewToolBar = new KToggleAction(i18n("Show &View Toolbar"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowViewToolBar()), actionCollection(),"show_viewToolBar"); #ifdef havesetCheckedState m_pShowViewToolBar->setCheckedState(i18n("Hide &View Toolbar")); #endif - m_pShowSettingsToolBar = new KToggleAction(i18n("Show &Settings Toolbar"), 0, 0, this, + m_pShowSettingsToolBar = new KToggleAction(i18n("Show &Settings Toolbar"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotShowSettingsToolBar()), actionCollection(),"show_settingsToolBar"); #ifdef havesetCheckedState m_pShowSettingsToolBar->setCheckedState(i18n("Hide &Settings Toolbar")); #endif - m_modeFollowMouse = new KRadioAction(i18n("&Follow Mouse Mode"), "followmouse", Key_F1, this, + m_modeFollowMouse = new KRadioAction(i18n("&Follow Mouse Mode"), "followmouse", Key_F1, TQT_TQOBJECT(this), TQT_SLOT(slotModeFollowMouse()), actionCollection(), "mode_followmouse"); m_modeFollowMouse->setToolTip(i18n("Magnify mouse area into window")); m_modeFollowMouse->setWhatsThis(i18n("In this mode the area around the mouse cursor is shown in a normal window.")); - m_modeSelWin = new KRadioAction(i18n("S&election Window Mode"), "window", Key_F2, this, + m_modeSelWin = new KRadioAction(i18n("S&election Window Mode"), "window", Key_F2, TQT_TQOBJECT(this), TQT_SLOT(slotModeSelWin()), actionCollection(), "mode_selectionwindow"); m_modeSelWin->setToolTip(i18n("Magnify selected area into window")); m_modeSelWin->setWhatsThis(i18n("In this mode a selection window is opened. The selected area is shown in a normal window.")); - m_modeEdgeTop = new KRadioAction(i18n("&Top Screen Edge Mode"), 0, 0, this, + m_modeEdgeTop = new KRadioAction(i18n("&Top Screen Edge Mode"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotModeEdgeTop()), actionCollection(),"mode_edgetop"); m_modeEdgeTop->setToolTip(i18n("Magnify mouse area to top screen edge")); m_modeEdgeTop->setWhatsThis(i18n("In this mode the area around the mouse is magnified to the top screen edge.")); - m_modeEdgeLeft = new KRadioAction(i18n("&Left Screen Edge Mode"), 0, 0, this, + m_modeEdgeLeft = new KRadioAction(i18n("&Left Screen Edge Mode"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotModeEdgeLeft()), actionCollection(),"mode_edgeleft"); m_modeEdgeLeft->setToolTip(i18n("Magnify mouse area to left screen edge")); m_modeEdgeLeft->setWhatsThis(i18n("In this mode the area around the mouse is magnified to the left screen edge.")); - m_modeEdgeRight = new KRadioAction(i18n("&Right Screen Edge Mode"), 0, 0, this, + m_modeEdgeRight = new KRadioAction(i18n("&Right Screen Edge Mode"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotModeEdgeRight()), actionCollection(),"mode_edgeright"); m_modeEdgeRight->setToolTip(i18n("Magnify mouse area to right screen edge")); m_modeEdgeRight->setWhatsThis(i18n("In this mode the area around the mouse is magnified to the right screen edge.")); - m_modeEdgeBottom = new KRadioAction(i18n("&Bottom Screen Edge Mode"), 0, 0, this, + m_modeEdgeBottom = new KRadioAction(i18n("&Bottom Screen Edge Mode"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotModeEdgeBottom()), actionCollection(),"mode_edgebottom"); m_modeEdgeBottom->setToolTip(i18n("Magnify mouse area to bottom screen edge")); m_modeEdgeBottom->setWhatsThis(i18n("In this mode the area around the mouse is magnified to the bottom screen edge.")); - m_hideCursor = new KToggleAction(i18n("Hide Mouse &Cursor"), "hidemouse", Key_F4, this, + m_hideCursor = new KToggleAction(i18n("Hide Mouse &Cursor"), "hidemouse", Key_F4, TQT_TQOBJECT(this), TQT_SLOT(slotToggleHideCursor()), actionCollection(), "hidecursor"); #ifdef havesetCheckedState m_hideCursor->setCheckedState(i18n("Show Mouse &Cursor")); #endif m_hideCursor->setToolTip(i18n("Hide the mouse cursor")); - m_pZoomIn = KStdAction::zoomIn(this, TQT_SLOT(zoomIn()), actionCollection(), "zoom_in"); + m_pZoomIn = KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT(zoomIn()), actionCollection(), "zoom_in"); m_pZoomIn->setWhatsThis(i18n("Click on this button to <b>zoom-in</b> on the selected region.")); m_pZoomBox = new KSelectAction(i18n("&Zoom"),0,actionCollection(),"zoom"); @@ -219,10 +219,10 @@ void KmagApp::initActions() m_pZoomBox->setWhatsThis(i18n("Select the zoom factor.")); m_pZoomBox->setToolTip(i18n("Zoom factor")); - m_pZoomOut = KStdAction::zoomOut(this, TQT_SLOT(zoomOut()), actionCollection(), "zoom_out"); + m_pZoomOut = KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT(zoomOut()), actionCollection(), "zoom_out"); m_pZoomOut->setWhatsThis(i18n("Click on this button to <b>zoom-out</b> on the selected region.")); - m_pInvert = new KToggleAction(i18n("&Invert Colors"), 0, Key_F6, this, + m_pInvert = new KToggleAction(i18n("&Invert Colors"), 0, Key_F6, TQT_TQOBJECT(this), TQT_SLOT(slotToggleInvert()), actionCollection(), "invert"); m_pRotationBox = new KSelectAction(i18n("&Rotation"),0,actionCollection(),"rotation"); @@ -232,8 +232,8 @@ void KmagApp::initActions() // KHelpMenu *newHelpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData()); - m_keyConf = KStdAction::keyBindings( this, TQT_SLOT( slotConfKeys() ), actionCollection(), "key_conf"); - m_toolConf = KStdAction::configureToolbars( this, TQT_SLOT( slotEditToolbars() ), + m_keyConf = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfKeys() ), actionCollection(), "key_conf"); + m_toolConf = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotEditToolbars() ), actionCollection(), "toolbar_conf"); m_pFPSBox = new KSelectAction(i18n("Re&fresh"),0,actionCollection(),"fps_selector"); @@ -247,7 +247,7 @@ void KmagApp::initActions() void KmagApp::initView() { m_zoomView = new KMagZoomView( this, "ZoomView" ); - m_zoomView->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, m_zoomView->sizePolicy().hasHeightForWidth() ) ); + m_zoomView->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, m_zoomView->sizePolicy().hasHeightForWidth() ) ); m_zoomView->setFrameShape( TQFrame::StyledPanel ); m_zoomView->setFrameShadow( TQFrame::Raised ); @@ -270,11 +270,11 @@ void KmagApp::initConnections() connect(this, TQT_SIGNAL(updateFPSIndex(int)), m_pFPSBox, TQT_SLOT(setCurrentItem(int))); // selector selects a zoom index -> set the zoom index - connect(m_pZoomBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setZoomIndex(int))); - connect(m_pRotationBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setRotationIndex(int))); - connect(m_pFPSBox, TQT_SIGNAL(activated(int)), this, TQT_SLOT(setFPSIndex(int))); + connect(m_pZoomBox, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setZoomIndex(int))); + connect(m_pRotationBox, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setRotationIndex(int))); + connect(m_pFPSBox, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(setFPSIndex(int))); - connect(m_zoomView, TQT_SIGNAL(contextMenu(TQPoint)), this, TQT_SLOT(contextMenu(TQPoint))); + connect(m_zoomView, TQT_SIGNAL(contextMenu(TQPoint)), TQT_TQOBJECT(this), TQT_SLOT(contextMenu(TQPoint))); } /** @@ -550,12 +550,12 @@ void KmagApp::saveZoomPixmap() bool toggled(false); // stop refresh temporarily - if (m_zoomView->getRefreshStatus()) { + if (m_zoomView->getRefreshtqStatus()) { slotToggleRefresh(); toggled = true; } - KURL url = KFileDialog::getSaveURL(TQString::null, + KURL url = KFileDialog::getSaveURL(TQString(), KImageIO::pattern(KImageIO::Writing), 0,i18n("Save Snapshot As")); @@ -571,7 +571,7 @@ void KmagApp::saveZoomPixmap() KMessageBox::error(0, i18n("Unable to upload file over the network."), i18n("Error Writing File")); } else { - KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").arg(url.prettyURL()), + KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").tqarg(url.prettyURL()), i18n("Information"), "save_confirm"); } } @@ -583,7 +583,7 @@ void KmagApp::saveZoomPixmap() KMessageBox::error(0, i18n("Unable to save file. Please check if you have permission to write to the directory."), i18n("Error Writing File")); } else { - KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").arg(url.prettyURL()), + KMessageBox::information(0, i18n("Current zoomed image saved to\n%1").tqarg(url.prettyURL()), i18n("Information"), "save_confirm"); } } @@ -597,7 +597,7 @@ void KmagApp::saveZoomPixmap() void KmagApp::slotToggleRefresh() { m_zoomView->toggleRefresh(); - if(m_zoomView->getRefreshStatus()) { + if(m_zoomView->getRefreshtqStatus()) { refreshSwitch->setIcon("stop.png"); refreshSwitch->setText(i18n("Stop")); refreshSwitch->setToolTip(i18n("Click to stop window update")); @@ -799,7 +799,7 @@ void KmagApp::slotFileNewWindow() void KmagApp::slotFilePrint() { -#ifndef QT_NO_PRINTER +#ifndef TQT_NO_PRINTER bool toggled(false); @@ -810,7 +810,7 @@ void KmagApp::slotFilePrint() #endif // stop refresh temporarily - if (m_zoomView->getRefreshStatus()) { + if (m_zoomView->getRefreshtqStatus()) { slotToggleRefresh(); toggled = true; } @@ -840,7 +840,7 @@ void KmagApp::slotFilePrint() if(toggled) { slotToggleRefresh(); } -#endif // QT_NO_PRINTER +#endif // TQT_NO_PRINTER } void KmagApp::slotFileQuit() @@ -864,7 +864,7 @@ void KmagApp::slotFileQuit() void KmagApp::copyToClipBoard() { - QClipboard *cb=KApplication::clipboard(); + TQClipboard *cb=KApplication::tqclipboard(); cb->setPixmap(m_zoomView->getPixmap()); } @@ -935,7 +935,7 @@ void KmagApp::slotEditToolbars() { saveMainWindowSettings( KGlobal::config(), "MainWindow" ); KEditToolbar dlg( actionCollection() ); - connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), this, TQT_SLOT( slotNewToolbarConfig() ) ); + connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_TQOBJECT(this), TQT_SLOT( slotNewToolbarConfig() ) ); if ( dlg.exec() ) createGUI(); } diff --git a/kmag/kmag.h b/kmag/kmag.h index 6a27f03..e84a176 100644 --- a/kmag/kmag.h +++ b/kmag/kmag.h @@ -29,7 +29,7 @@ #include "kmagzoomview.h" #include <vector> -// include files for Qt +// include files for TQt #include <tqstringlist.h> // include files for KDE @@ -57,12 +57,13 @@ class KmagApp : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** * Construtor of KmagApp, calls all init functions to create the application. */ - KmagApp(TQWidget* parent=0, const char* name=0); + KmagApp(TQWidget* tqparent=0, const char* name=0); /// Default destructor ~KmagApp(); @@ -70,7 +71,7 @@ class KmagApp : public KMainWindow protected: - /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration + /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration * file */ void saveOptions(); diff --git a/kmag/kmagselrect.cpp b/kmag/kmagselrect.cpp index 68e09b0..4a56d07 100644 --- a/kmag/kmagselrect.cpp +++ b/kmag/kmagselrect.cpp @@ -87,42 +87,42 @@ int getTitleSize () // Construction //-------------------------------------------------------------------------- -KMagSelRect::KMagSelRect(TQWidget *parent) : +KMagSelRect::KMagSelRect(TQWidget *tqparent) : TQRect() { - init(parent); + init(tqparent); } KMagSelRect::KMagSelRect(const TQPoint &topLeft, const TQPoint &bottomRight, - TQWidget *parent) : + TQWidget *tqparent) : TQRect(topLeft, bottomRight) { - init(parent); + init(tqparent); } KMagSelRect::KMagSelRect(const TQPoint &topLeft, const TQSize &size, - TQWidget *parent) : + TQWidget *tqparent) : TQRect(topLeft, size) { - init(parent); + init(tqparent); } KMagSelRect::KMagSelRect(int left, int top, int width, int height, - TQWidget *parent) : + TQWidget *tqparent) : TQRect(left, top, width, height) { - init(parent); + init(tqparent); } -void KMagSelRect::init(TQWidget *parent) +void KMagSelRect::init(TQWidget *tqparent) { - // 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); + // Make sure tqparent is the window itself, not a widget within the window + if (tqparent != 0) + while (tqparent->tqparentWidget (true) != 0) + tqparent=tqparent->tqparentWidget (true); selectionwindow = 0; - selWindowParent = parent; + selWindowParent = tqparent; m_alwaysVisible = false; } @@ -184,19 +184,19 @@ void KMagSelRect::hide() void KMagSelRect::update() { // make sure the selection window does not go outside of the display - if (height() > TQApplication::desktop()->geometry().height()) - setHeight (TQApplication::desktop()->geometry().height()); - if (width() > TQApplication::desktop()->geometry().width()) - setWidth (TQApplication::desktop()->geometry().width()); + if (height() > TQApplication::desktop()->tqgeometry().height()) + setHeight (TQApplication::desktop()->tqgeometry().height()); + if (width() > TQApplication::desktop()->tqgeometry().width()) + setWidth (TQApplication::desktop()->tqgeometry().width()); if (top() < 0) moveTop (0); if (left() < 0) moveLeft (0); - if (bottom() > TQApplication::desktop()->geometry().bottom()) - moveBottom (TQApplication::desktop()->geometry().bottom()); - if (right() > TQApplication::desktop()->geometry().right()) - moveRight (TQApplication::desktop()->geometry().right()); + if (bottom() > TQApplication::desktop()->tqgeometry().bottom()) + moveBottom (TQApplication::desktop()->tqgeometry().bottom()); + if (right() > TQApplication::desktop()->tqgeometry().right()) + moveRight (TQApplication::desktop()->tqgeometry().right()); if (selectionwindow != 0) selectionwindow->setSelRect (TQRect (topLeft(), bottomRight())); @@ -215,8 +215,8 @@ void KMagSelRect::selWinResized() // KMagSelWin //-------------------------------------------------------------------------- -KMagSelWin::KMagSelWin ( TQWidget * parent, const char * name, WFlags ) : - TQWidget (parent, name, WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop | WType_TopLevel | WX11BypassWM) +KMagSelWin::KMagSelWin ( TQWidget * tqparent, const char * name, WFlags ) : + TQWidget (tqparent, name, WStyle_Customize | WStyle_NoBorder | WStyle_StaysOnTop | WType_TopLevel | WX11BypassWM) { TQBitmap line (8, 8, line_bits, true); setPaletteBackgroundPixmap (line); @@ -230,25 +230,25 @@ KMagSelWin::KMagSelWin ( TQWidget * parent, const char * name, WFlags ) : connect (titleBar, TQT_SIGNAL (resized (TQPoint)), this, TQT_SLOT (titleMoved (TQPoint))); topLeftCorner = new KMagSelWinCorner (this, "topleft"); - topLeftCorner->setCursor (Qt::SizeFDiagCursor); + topLeftCorner->setCursor (TQt::SizeFDiagCursor); topLeftCorner->setPaletteBackgroundColor (getTitleBtnColor ()); connect (topLeftCorner, TQT_SIGNAL (startResizing ()), this, TQT_SLOT (startResizing ())); connect (topLeftCorner, TQT_SIGNAL (resized (TQPoint)), this, TQT_SLOT (topLeftResized (TQPoint))); topRightCorner = new KMagSelWinCorner (this, "topright"); - topRightCorner->setCursor (Qt::SizeBDiagCursor); + topRightCorner->setCursor (TQt::SizeBDiagCursor); topRightCorner->setPaletteBackgroundColor (getTitleBtnColor ()); connect (topRightCorner, TQT_SIGNAL (startResizing ()), this, TQT_SLOT (startResizing ())); connect (topRightCorner, TQT_SIGNAL (resized (TQPoint)), this, TQT_SLOT (topRightResized (TQPoint))); bottomLeftCorner = new KMagSelWinCorner (this, "bottomleft"); - bottomLeftCorner->setCursor (Qt::SizeBDiagCursor); + bottomLeftCorner->setCursor (TQt::SizeBDiagCursor); bottomLeftCorner->setPaletteBackgroundColor (getTitleBtnColor ()); connect (bottomLeftCorner, TQT_SIGNAL (startResizing ()), this, TQT_SLOT (startResizing ())); connect (bottomLeftCorner, TQT_SIGNAL (resized (TQPoint)), this, TQT_SLOT (bottomLeftResized (TQPoint))); bottomRightCorner = new KMagSelWinCorner (this, "bottomright"); - bottomRightCorner->setCursor (Qt::SizeFDiagCursor); + bottomRightCorner->setCursor (TQt::SizeFDiagCursor); bottomRightCorner->setPaletteBackgroundColor (getTitleBtnColor ()); connect (bottomRightCorner, TQT_SIGNAL (startResizing ()), this, TQT_SLOT (startResizing ())); connect (bottomRightCorner, TQT_SIGNAL (resized (TQPoint)), this, TQT_SLOT (bottomRightResized (TQPoint))); @@ -356,8 +356,8 @@ void KMagSelWin::bottomRightResized ( TQPoint offset ) // KMagSelWinCorner //-------------------------------------------------------------------------- -KMagSelWinCorner::KMagSelWinCorner ( TQWidget * parent, const char * name, WFlags f ) : - TQLabel (parent, name, f) +KMagSelWinCorner::KMagSelWinCorner ( TQWidget * tqparent, const char * name, WFlags f ) : + TQLabel (tqparent, name, f) { setFrameStyle (TQFrame::WinPanel | TQFrame::Raised); setLineWidth (1); diff --git a/kmag/kmagselrect.h b/kmag/kmagselrect.h index e0e8348..9180b36 100644 --- a/kmag/kmagselrect.h +++ b/kmag/kmagselrect.h @@ -22,18 +22,19 @@ #include <stdlib.h> -// Qt includes +// TQt includes #include <tqrect.h> #include <tqwidget.h> #include <tqlabel.h> -class KMagSelWinCorner : public QLabel +class KMagSelWinCorner : public TQLabel { Q_OBJECT + TQ_OBJECT public: - KMagSelWinCorner ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + KMagSelWinCorner ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); virtual ~KMagSelWinCorner(); @@ -51,13 +52,14 @@ protected: virtual void mouseMoveEvent ( TQMouseEvent * e ); }; -class KMagSelWin : public QWidget +class KMagSelWin : public TQWidget { Q_OBJECT + TQ_OBJECT public: - KMagSelWin ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 ); + KMagSelWin ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 ); virtual ~KMagSelWin(); @@ -95,16 +97,17 @@ protected: * @author Original : Michael Forster * @author Current : Sarang Lakare */ -class KMagSelRect : public TQObject, public QRect +class KMagSelRect : public TQObject, public TQRect { Q_OBJECT + TQ_OBJECT public: - KMagSelRect(TQWidget *parent=0); + KMagSelRect(TQWidget *tqparent=0); KMagSelRect(const TQPoint &topLeft, const TQPoint &bottomRight, - TQWidget *parent=0); + TQWidget *tqparent=0); KMagSelRect(const TQPoint &topLeft, const TQSize &size, - TQWidget *parent=0); + TQWidget *tqparent=0); KMagSelRect(int left, int top, int width, int height, TQWidget *selWindowParent=0); diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp index 4010fce..7608887 100644 --- a/kmag/kmagzoomview.cpp +++ b/kmag/kmagzoomview.cpp @@ -22,7 +22,7 @@ #include "kmagzoomview.h" #include "kmagzoomview.moc" -// include files for Qt +// include files for TQt #include <tqbitmap.h> #include <tqpixmap.h> #include <tqimage.h> @@ -80,22 +80,22 @@ static uchar phand_bits[] = { static bool obscuredRegion (TQRegion ®ion, Window winId, Window ignoreId, Window start = 0, int level = -1) { - Window root, parent, *children; uint nchildren; + Window root, tqparent, *tqchildren; uint ntqchildren; if (0 == start) start = qt_xrootwin(); bool winIdFound = false; - if (0 != XQueryTree (qt_xdisplay(), start, &root, &parent, &children, &nchildren)) { - for (uint i=0; i < nchildren; ++i) { + if (0 != XQueryTree (qt_xdisplay(), start, &root, &tqparent, &tqchildren, &ntqchildren)) { + for (uint i=0; i < ntqchildren; ++i) { if (winIdFound) { - if (ignoreId != children [i]) { + if (ignoreId != tqchildren [i]) { XWindowAttributes atts; - XGetWindowAttributes (qt_xdisplay(), children [i], &atts); + XGetWindowAttributes (qt_xdisplay(), tqchildren [i], &atts); if (atts.map_state == IsViewable) region -= TQRegion (atts.x, atts.y, atts.width, atts.height, TQRegion::Rectangle); } } - else if (winId == children [i]) + else if (winId == tqchildren [i]) winIdFound = true; // According to tests, my own window ID is either on toplevel or two levels below. @@ -103,15 +103,15 @@ static bool obscuredRegion (TQRegion ®ion, Window winId, Window ignoreId, Win // then to five recursion levels, and make a full recursive search only if that // was unsuccessful. else if (level > 1) - winIdFound = obscuredRegion (region, winId, ignoreId, children [i], level-1); + winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], level-1); else if (level == -1) - if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 0))) - if (! (winIdFound = obscuredRegion (region, winId, ignoreId, children [i], 1))) - winIdFound = obscuredRegion (region, winId, ignoreId, children [i], -1); + if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 0))) + if (! (winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], 1))) + winIdFound = obscuredRegion (region, winId, ignoreId, tqchildren [i], -1); } - if (children != NULL) - XFree (children); + if (tqchildren != NULL) + XFree (tqchildren); } return winIdFound; @@ -120,8 +120,8 @@ static bool obscuredRegion (TQRegion ®ion, Window winId, Window ignoreId, Win -KMagZoomView::KMagZoomView(TQWidget *parent, const char *name) - : TQScrollView(parent, name), +KMagZoomView::KMagZoomView(TQWidget *tqparent, const char *name) + : TQScrollView(tqparent, name), m_selRect(0, 0, 128, 128, this), m_grabTimer(0), m_mouseViewTimer(0), @@ -136,7 +136,7 @@ KMagZoomView::KMagZoomView(TQWidget *parent, const char *name) KApplication::setGlobalMouseTracking(TRUE); viewport()->setMouseTracking(TRUE); viewport()->setBackgroundMode (NoBackground); - viewport()->setFocusPolicy(TQWidget::StrongFocus); + viewport()->setFocusPolicy(TQ_StrongFocus); m_ctrlKeyPressed = false; m_shiftKeyPressed = false; @@ -227,7 +227,7 @@ void KMagZoomView::resizeEvent( TQResizeEvent * e ) } /** - * Called when the widget is to be repainted + * Called when the widget is to be tqrepainted * * @param p */ @@ -246,7 +246,7 @@ void KMagZoomView::drawContents ( TQPainter * p, int clipx, int clipy, int clipw // show the pixel under mouse cursor if(m_showMouse) { // paint the mouse cursor - paintMouseCursor(&clippedPixmap, calcMousePos (m_refreshSwitch)-TQPoint (areaToPaint.x(), areaToPaint.y())); + paintMouseCursor(TQT_TQPAINTDEVICE(&clippedPixmap), calcMousePos (m_refreshSwitch)-TQPoint (areaToPaint.x(), areaToPaint.y())); } TQPixmap zoomedPixmap; @@ -255,9 +255,9 @@ void KMagZoomView::drawContents ( TQPainter * p, int clipx, int clipy, int clipw if (m_invert) { TQImage zoomedImage; zoomedImage = zoomedPixmap.convertToImage(); - zoomedImage.invertPixels (false); + zoomedImage.tqinvertPixels (false); p->drawImage (TQPoint (clipx-contentsX(), clipy-contentsY()), zoomedImage, zoomedImage.rect(), - Qt::ThresholdDither | Qt::ThresholdAlphaDither | Qt::AvoidDither); + TQt::ThresholdDither | TQt::ThresholdAlphaDither | TQt::AvoidDither); } else { p->drawPixmap (TQPoint (clipx, clipy), zoomedPixmap, zoomedPixmap.rect()); } @@ -283,20 +283,20 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos) switch(m_showMouse) { case 1: // 1. Square around the pixel - pz.setPen(Qt::white); - pz.setRasterOp(Qt::XorROP); + pz.setPen(TQt::white); + pz.setRasterOp(TQt::XorROP); pz.drawRect(mousePos.x()-1, mousePos.y()-1, 3, 3); break; case 2: { // 2. Arrow cursor - pz.setPen(Qt::black); - pz.setBackgroundColor(Qt::white); + pz.setPen(TQt::black); + pz.setBackgroundColor(TQt::white); TQBitmap sCursor( 16, 16, left_ptr_bits, TRUE ); - TQBitmap mask( 16, 16, left_ptrmsk_bits, TRUE ); - sCursor.setMask(mask); + TQBitmap tqmask( 16, 16, left_ptrmsk_bits, TRUE ); + sCursor.setMask(tqmask); // since hot spot is at 3,1 pz.drawPixmap(mousePos.x()-3, mousePos.y()-1, sCursor); @@ -315,12 +315,12 @@ void KMagZoomView::paintMouseCursor(TQPaintDevice *dev, TQPoint mousePos) case ArrowCursor : { // 2. Arrow cursor - pz.setPen(Qt::black); - pz.setBackgroundColor(Qt::white); + pz.setPen(TQt::black); + pz.setBackgroundColor(TQt::white); TQBitmap sCursor( 16, 16, left_ptr_bits, TRUE ); - TQBitmap mask( 16, 16, left_ptrmsk_bits, TRUE ); - sCursor.setMask(mask); + TQBitmap tqmask( 16, 16, left_ptrmsk_bits, TRUE ); + sCursor.setMask(tqmask); // 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 mask( 32, 32, phandm_bits, TRUE ); - sCursor.setMask(mask); + TQBitmap tqmask( 32, 32, phandm_bits, TRUE ); + sCursor.setMask(tqmask); pz.drawPixmap(mousePos.x(), mousePos.y(), sCursor); break; @@ -370,7 +370,7 @@ TQPoint KMagZoomView::calcMousePos(bool updateMousePos) void KMagZoomView::mousePressEvent(TQMouseEvent *e) { switch(e->button()) { - case TQMouseEvent::LeftButton : + case Qt::LeftButton : if(m_ctrlKeyPressed) { // check if currently in resize mode // don't do anything if fitToWindow is enabled @@ -392,10 +392,8 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e) m_selRect.show(); } else { - #if QT_VERSION >= 300 - // ignore this button press.. so it goes to the parent + // ignore this button press.. so it goes to the tqparent e->ignore(); - #endif } } else if(m_shiftKeyPressed) { // check if currently in move mode @@ -417,10 +415,8 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e) m_selRect.show(); } else { - #if QT_VERSION >= 300 - // ignore this button press.. so it goes to the parent + // ignore this button press.. so it goes to the tqparent e->ignore(); - #endif } } else { // check if currently in move mode @@ -441,15 +437,13 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e) m_selRect.show(); } else { - #if QT_VERSION >= 300 - // ignore this button press.. so it goes to the parent + // ignore this button press.. so it goes to the tqparent e->ignore(); - #endif } } break; - case TQMouseEvent::MidButton : + case Qt::MidButton : // check if currently in move mode // don't do anything if follow mouse is enabled if ((m_mouseMode != MoveSelection) && !m_followMouse) { @@ -469,18 +463,14 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e) m_selRect.show(); } else { - #if QT_VERSION >= 300 - // ignore this button press.. so it goes to the parent + // ignore this button press.. so it goes to the tqparent e->ignore(); - #endif } break; // do nothing default: -#if QT_VERSION >= 300 - // ignore this button press.. so it goes to the parent + // ignore this button press.. so it goes to the tqparent e->ignore(); -#endif break; } } @@ -494,8 +484,8 @@ void KMagZoomView::mousePressEvent(TQMouseEvent *e) void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e) { switch(e->button()) { - case TQMouseEvent::LeftButton : - case TQMouseEvent::MidButton : + case Qt::LeftButton : + case Qt::MidButton : // check if currently in move mode if(m_mouseMode == MoveSelection) { // hide the selection window @@ -503,7 +493,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e) // set the mouse mode to normal m_mouseMode = Normal; - // restore the cursor shape + // restore the cursor tqshape setCursor(arrowCursor); // restore the cursor position @@ -514,7 +504,7 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e) // set the mouse mode to normal m_mouseMode = Normal; - // restore the cursor shape + // restore the cursor tqshape setCursor(arrowCursor); // restore the cursor position @@ -526,14 +516,14 @@ void KMagZoomView::mouseReleaseEvent(TQMouseEvent *e) // set the mouse mode to normal m_mouseMode = Normal; - // restore the cursor shape + // restore the cursor tqshape setCursor(arrowCursor); } break; - case TQMouseEvent::RightButton : + case Qt::RightButton : break; - case TQMouseEvent::NoButton : + case Qt::NoButton : break; // do nothing @@ -582,16 +572,16 @@ void KMagZoomView::mouseMoveEvent(TQMouseEvent *e) void KMagZoomView::keyPressEvent(TQKeyEvent *e) { int offset = 16; - if (e->state() & TQKeyEvent::ShiftButton) + if (e->state() & TQt::ShiftButton) offset = 1; - if (e->key() == TQKeyEvent::Key_Control) + if (e->key() == TQt::Key_Control) m_ctrlKeyPressed = true; - else if (e->key() == TQKeyEvent::Key_Shift) - m_shiftKeyPressed = true; - else if (e->key() == TQKeyEvent::Key_Left) + else if (e->key() == TQt::Key_Shift) + m_shiftKeyPressed = true; + else if (e->key() == TQt::Key_Left) { - if (e->state() & TQKeyEvent::ControlButton) + if (e->state() & TQt::ControlButton) { if (offset >= m_selRect.width()) m_selRect.setWidth (1); @@ -615,9 +605,9 @@ void KMagZoomView::keyPressEvent(TQKeyEvent *e) } m_selRect.update(); } - else if (e->key() == TQKeyEvent::Key_Right) + else if (e->key() == TQt::Key_Right) { - if (e->state() & TQKeyEvent::ControlButton) + if (e->state() & TQt::ControlButton) m_selRect.setRight (m_selRect.right()+offset); else if (contentsX() < contentsWidth()-visibleWidth()) { @@ -632,9 +622,9 @@ void KMagZoomView::keyPressEvent(TQKeyEvent *e) m_selRect.update(); } - else if (e->key() == TQKeyEvent::Key_Up) + else if (e->key() == TQt::Key_Up) { - if (e->state() & TQKeyEvent::ControlButton) + if (e->state() & TQt::ControlButton) { if (offset >= m_selRect.height()) m_selRect.setHeight (1); @@ -658,9 +648,9 @@ void KMagZoomView::keyPressEvent(TQKeyEvent *e) } m_selRect.update(); } - else if (e->key() == TQKeyEvent::Key_Down) + else if (e->key() == TQt::Key_Down) { - if (e->state() & TQKeyEvent::ControlButton) + if (e->state() & TQt::ControlButton) m_selRect.setBottom (m_selRect.bottom()+offset); else if (contentsY() < contentsHeight()-visibleHeight()) { @@ -680,9 +670,9 @@ void KMagZoomView::keyPressEvent(TQKeyEvent *e) void KMagZoomView::keyReleaseEvent(TQKeyEvent *e) { - if (e->key() == TQKeyEvent::Key_Control) + if (e->key() == TQt::Key_Control) m_ctrlKeyPressed = false; - else if (e->key() == TQKeyEvent::Key_Shift) + else if (e->key() == TQt::Key_Shift) m_shiftKeyPressed = false; else e->ignore(); @@ -716,7 +706,7 @@ void KMagZoomView::fitToWindow() m_selRect.moveCenter(currCenter); m_selRect.update(); - viewport()->repaint(false); + viewport()->tqrepaint(false); } void KMagZoomView::setFitToWindow(bool fit) @@ -761,18 +751,18 @@ void KMagZoomView::grabFrame() intersection &= TQRegion (selRect, TQRegion::Rectangle); // We don't want to overpaint other windows that happen to be on top - obscuredRegion (intersection, topLevelWidget()->winId(), m_selRect.winId()); + obscuredRegion (intersection, tqtopLevelWidget()->winId(), m_selRect.winId()); intersection.translate (-selRect.x(), -selRect.y()); TQPainter painter (&m_grabbedPixmap, true); - TQMemArray<TQRect> rects (intersection.rects()); + TQMemArray<TQRect> rects (intersection.tqrects()); for (uint i = 0; i < rects.size(); i++) painter.fillRect (rects[i], TQBrush (TQColor (128, 128, 128))); - // call repaint to display the newly grabbed image + // call tqrepaint to display the newly grabbed image TQRect newSize = m_zoomMatrix.mapRect (m_grabbedPixmap.rect()); resizeContents (newSize.width(), newSize.height()); - viewport()->repaint(false); + viewport()->tqrepaint(false); } @@ -785,7 +775,7 @@ void KMagZoomView::updateMouseView() if(m_selRect.left() <= pos.x() && pos.x() <= m_selRect.right() && m_selRect.top() <= pos.y() && pos.y() <= m_selRect.bottom() && m_refreshSwitch) - viewport()->repaint(false); + viewport()->tqrepaint(false); } /** @@ -811,7 +801,7 @@ void KMagZoomView::setZoom(float zoom) { m_zoom = zoom; updateMatrix(); - viewport()->repaint(); + viewport()->tqrepaint(); } /** @@ -821,7 +811,7 @@ void KMagZoomView::setRotation(int rotation) { m_rotation = rotation; updateMatrix(); - viewport()->repaint(); + viewport()->tqrepaint(); } /** @@ -830,7 +820,7 @@ void KMagZoomView::setRotation(int rotation) void KMagZoomView::setInvertation(bool invert) { m_invert = invert; - viewport()->repaint(); + viewport()->tqrepaint(); } /** @@ -899,7 +889,7 @@ TQPixmap KMagZoomView::getPixmap() TQPixmap mousePixmap(m_grabbedPixmap); // paint the mouse cursor w/o updating to a newer position - paintMouseCursor(&mousePixmap, calcMousePos(false)); + paintMouseCursor(TQT_TQPAINTDEVICE(&mousePixmap), calcMousePos(false)); return(mousePixmap); } else { // no mouse cursor diff --git a/kmag/kmagzoomview.h b/kmag/kmagzoomview.h index 7b631ae..0c492cb 100644 --- a/kmag/kmagzoomview.h +++ b/kmag/kmagzoomview.h @@ -24,7 +24,7 @@ #include <config.h> #endif -// include files for Qt +// include files for TQt #include <tqwidget.h> #include <tqpainter.h> #include <tqpixmap.h> @@ -43,12 +43,13 @@ * @author Olaf Schmikt <ojschmidt@kde.org> * @author Sarang Lakare <sarang#users.sourceforge.net> */ -class KMagZoomView : public QScrollView +class KMagZoomView : public TQScrollView { Q_OBJECT + TQ_OBJECT public: /// Constructor for the main view - KMagZoomView(TQWidget *parent = 0, const char *name=0); + KMagZoomView(TQWidget *tqparent = 0, const char *name=0); /// Destructor for the main view ~KMagZoomView(); @@ -60,7 +61,7 @@ class KMagZoomView : public QScrollView TQPixmap getPixmap(); /// Returns the state of the refresh switch - bool getRefreshStatus() const { return m_refreshSwitch; }; + bool getRefreshtqStatus() const { return m_refreshSwitch; }; /// Returns teh status of followMouse bool getFollowMouse() const { return m_followMouse; }; @@ -69,7 +70,7 @@ class KMagZoomView : public QScrollView bool getShowSelRect() const { return (m_selRect.getAlwaysVisible()); }; /// Get the coordinates of the selection rectangle - TQRect getSelRectPos() const { return static_cast<TQRect>(m_selRect); }; + TQRect getSelRectPos() const { return (TQRect&)(m_selRect); }; /// Returns the current state of show mouse unsigned int getShowMouseType() const; @@ -131,7 +132,7 @@ class KMagZoomView : public QScrollView /// Called when the widget has been resized void resizeEvent(TQResizeEvent *e); - /// Called when the widget is to be repainted + /// Called when the widget is to be tqrepainted void drawContents ( TQPainter * p, int clipx, int clipy, int clipw, int cliph ); /// This function calculates the mouse position relative to the image diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp index c54da8a..3e03e23 100644 --- a/kmousetool/kmousetool/kmousetool.cpp +++ b/kmousetool/kmousetool/kmousetool.cpp @@ -147,7 +147,7 @@ void KMouseTool::timerEvent( TQTimerEvent * ) return; if (!continue_timer) { - killTimers(); + TQT_TQOBJECT(this)->killTimers(); return; } @@ -250,7 +250,7 @@ void KMouseTool::playTickSound() // TQSound::play(mSoundFileName); } -KMouseTool::KMouseTool(TQWidget *parent, const char *name) : KMouseToolUI(parent, name) +KMouseTool::KMouseTool(TQWidget *tqparent, const char *name) : KMouseToolUI(tqparent, name) { init_vars(); resetSettings(); @@ -608,7 +608,7 @@ void KMouseTool::aboutSelected() -KMouseToolTray::KMouseToolTray (TQWidget *parent, const char *name) : KSystemTray (parent, name) +KMouseToolTray::KMouseToolTray (TQWidget *tqparent, const char *name) : KSystemTray (tqparent, 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 7f6fa0b..fde5566 100644 --- a/kmousetool/kmousetool/kmousetool.h +++ b/kmousetool/kmousetool/kmousetool.h @@ -55,6 +55,7 @@ class KMouseToolTray; class KMouseTool : public KMouseToolUI { Q_OBJECT + TQ_OBJECT private: MTStroke stroke; @@ -77,7 +78,7 @@ private: TQString autostartdirname; TQString rcfilename; TQString appfilename; - QString mSoundFileName; + TQString mSoundFileName; KAudioPlayer *mplayer; KMouseToolTray *trayIcon; @@ -186,7 +187,7 @@ public: /** * construtor */ - KMouseTool(TQWidget* parent=0, const char *name=0); + KMouseTool(TQWidget* tqparent=0, const char *name=0); /** destructor */ ~KMouseTool(); @@ -194,9 +195,10 @@ public: class KMouseToolTray : public KSystemTray { Q_OBJECT + TQ_OBJECT int startStopId; public: - KMouseToolTray (TQWidget *parent=0, const char *name=0); + KMouseToolTray (TQWidget *tqparent=0, const char *name=0); ~KMouseToolTray(); void updateStartStopText (bool mousetool_is_running); diff --git a/kmousetool/kmousetool/kmousetoolui.ui b/kmousetool/kmousetool/kmousetoolui.ui index 05b3322..5e6b1a9 100644 --- a/kmousetool/kmousetool/kmousetoolui.ui +++ b/kmousetool/kmousetool/kmousetoolui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>KMouseToolUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KMouseToolUI</cstring> </property> @@ -29,14 +29,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> </size> </property> </spacer> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>groupBox1</cstring> </property> @@ -47,9 +47,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <grid> <property name="name"> @@ -65,14 +65,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="1"> + <widget class="TQLabel" row="0" column="1"> <property name="name"> <cstring>dragTimeLabel</cstring> </property> @@ -137,7 +137,7 @@ <number>5</number> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>movementLabel</cstring> </property> @@ -167,7 +167,7 @@ <number>1</number> </property> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cbStroke</cstring> </property> @@ -175,7 +175,7 @@ <string>&Enable strokes</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>dwellTimeLabel</cstring> </property> @@ -194,7 +194,7 @@ <cstring>dwellTimeEdit</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cbDrag</cstring> </property> @@ -205,9 +205,9 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="7" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -239,7 +239,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -256,7 +256,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cbStart</cstring> </property> @@ -264,7 +264,7 @@ <string>Start with &KDE</string> </property> </widget> - <widget class="QCheckBox" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>cbClick</cstring> </property> @@ -274,15 +274,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -300,7 +300,7 @@ <property name="scaledContents"> <bool>false</bool> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignJustify|AlignVCenter</set> </property> </widget> @@ -314,7 +314,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>8</width> <height>8</height> @@ -339,9 +339,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -365,7 +365,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>241</width> <height>20</height> @@ -406,7 +406,7 @@ <slot>setEnabled(bool)</slot> </connection> </connections> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>knuminput.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kmouth/books/sv-personal.phrasebook b/kmouth/books/sv-personal.phrasebook index 37f7636..cb4efe7 100644 --- a/kmouth/books/sv-personal.phrasebook +++ b/kmouth/books/sv-personal.phrasebook @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE phrasebook> <phrasebook name="Personligt"> -<phrase shortcut="">Jag kan bara prata med hjälp av den här dumma maskinen.</phrase> +<phrase shortcut="">Jag kan bara prata med hjälp av den här dumma tqmaskinen.</phrase> <phrase shortcut="">Tyvärr är jag ganska trött nu och behöver ta en paus.</phrase> <phrase shortcut="">Tack för att du kom.</phrase> <phrase shortcut="">Trevligt att se dig.</phrase> diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp index 3d99005..bce57e4 100644 --- a/kmouth/configwizard.cpp +++ b/kmouth/configwizard.cpp @@ -31,8 +31,8 @@ #include "wordcompletion/wordcompletion.h" #include "wordcompletion/dictionarycreationwizard.h" -ConfigWizard::ConfigWizard (TQWidget *parent, const char *name, KConfig *config) - : KWizard(parent, name, true) +ConfigWizard::ConfigWizard (TQWidget *tqparent, const char *name, KConfig *config) + : KWizard(tqparent, name, true) { setCaption (i18n("Initial Configuration - KMouth")); @@ -88,7 +88,7 @@ void ConfigWizard::initCompletion (KConfig *config) { config->setGroup("Dictionary 0"); config->writeEntry ("Filename", "dictionary.txt"); config->writeEntry ("Name", "Default"); - config->writeEntry ("Language", TQString::null); + config->writeEntry ("Language", TQString()); config->sync(); } } diff --git a/kmouth/configwizard.h b/kmouth/configwizard.h index 112e25a..8f2dd55 100644 --- a/kmouth/configwizard.h +++ b/kmouth/configwizard.h @@ -35,8 +35,9 @@ class CompletionWizardWidget; class ConfigWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: - ConfigWizard (TQWidget *parent, const char *name, KConfig *config); + ConfigWizard (TQWidget *tqparent, const char *name, KConfig *config); ~ConfigWizard(); bool configurationNeeded (); diff --git a/kmouth/kmouth.cpp b/kmouth/kmouth.cpp index 76c715f..83c2797 100644 --- a/kmouth/kmouth.cpp +++ b/kmouth/kmouth.cpp @@ -95,57 +95,57 @@ bool KMouthApp::configured() { void KMouthApp::initActions() { // The "File" menu - fileOpen = new KAction(i18n("&Open as History..."), "phrasehistory_open", KStdAccel::open(), this, TQT_SLOT(slotFileOpen()), actionCollection(),"file_open"); + fileOpen = new KAction(i18n("&Open as History..."), "phrasehistory_open", KStdAccel::open(), TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection(),"file_open"); fileOpen->setStatusText(i18n("Opens an existing file as history")); fileOpen->setWhatsThis (i18n("Opens an existing file as history")); - fileSaveAs = new KAction(i18n("Save &History As..."), "phrasehistory_save", KStdAccel::save(), this, TQT_SLOT(slotFileSaveAs()), actionCollection(),"file_save_as"); + fileSaveAs = new KAction(i18n("Save &History As..."), "phrasehistory_save", KStdAccel::save(), TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection(),"file_save_as"); fileSaveAs->setStatusText(i18n("Saves the actual history as...")); fileSaveAs->setWhatsThis (i18n("Saves the actual history as...")); - filePrint = new KAction(i18n("&Print History..."), "phrasehistory_print", KStdAccel::print(), this, TQT_SLOT(slotFilePrint()), actionCollection(),"file_print"); + filePrint = new KAction(i18n("&Print History..."), "phrasehistory_print", KStdAccel::print(), TQT_TQOBJECT(this), TQT_SLOT(slotFilePrint()), actionCollection(),"file_print"); filePrint->setStatusText(i18n("Prints out the actual history")); filePrint->setWhatsThis (i18n("Prints out the actual history")); - fileQuit = KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); + fileQuit = KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); fileQuit->setStatusText(i18n("Quits the application")); fileQuit->setWhatsThis (i18n("Quits the application")); // The "Edit" menu - editCut = KStdAction::cut(phraseList, TQT_SLOT(cut()), actionCollection()); + editCut = KStdAction::cut(TQT_TQOBJECT(phraseList), TQT_SLOT(cut()), actionCollection()); editCut->setStatusText(i18n("Cuts the selected section and puts it to the clipboard")); editCut->setWhatsThis (i18n("Cuts the selected section and puts it to the clipboard. If there is some text selected in the edit field it is placed it on the clipboard. Otherwise the selected sentences in the history (if any) are placed on the clipboard.")); - editCopy = KStdAction::copy(phraseList, TQT_SLOT(copy()), actionCollection()); + editCopy = KStdAction::copy(TQT_TQOBJECT(phraseList), TQT_SLOT(copy()), actionCollection()); editCopy->setStatusText(i18n("Copies the selected section to the clipboard")); editCopy->setWhatsThis (i18n("Copies the selected section to the clipboard. If there is some text selected in the edit field it is copied to the clipboard. Otherwise the selected sentences in the history (if any) are copied to the clipboard.")); - editPaste = KStdAction::paste(phraseList, TQT_SLOT(paste()), actionCollection()); + editPaste = KStdAction::paste(TQT_TQOBJECT(phraseList), TQT_SLOT(paste()), actionCollection()); editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position")); editPaste->setWhatsThis (i18n("Pastes the clipboard contents at the current cursor position into the edit field.")); - editSpeak = new KAction (i18n("&Speak"), "speak", 0, phraseList, TQT_SLOT(speak()), actionCollection(),"edit_speak"); + editSpeak = new KAction (i18n("&Speak"), "speak", 0, TQT_TQOBJECT(phraseList), TQT_SLOT(speak()), actionCollection(),"edit_speak"); editSpeak->setStatusText(i18n("Speaks the currently active sentence(s)")); editSpeak->setWhatsThis (i18n("Speaks the currently active sentence(s). If there is some text in the edit field it is spoken. Otherwise the selected sentences in the history (if any) are spoken.")); // The "Phrase book" menu - phrasebookEdit = new KAction(i18n("&Edit..."), 0, 0, this, TQT_SLOT(slotEditPhrasebook()), actionCollection(),"phrasebook_edit"); + phrasebookEdit = new KAction(i18n("&Edit..."), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotEditPhrasebook()), actionCollection(),"phrasebook_edit"); // The "Options" menu - viewMenuBar = KStdAction::showMenubar(this, TQT_SLOT(slotViewMenuBar()), actionCollection()); - viewToolBar = KStdAction::showToolbar(this, TQT_SLOT(slotViewToolBar()), actionCollection()); + viewMenuBar = KStdAction::showMenubar(TQT_TQOBJECT(this), TQT_SLOT(slotViewMenuBar()), actionCollection()); + viewToolBar = KStdAction::showToolbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewToolBar()), actionCollection()); viewToolBar->setStatusText(i18n("Enables/disables the toolbar")); viewToolBar->setWhatsThis (i18n("Enables/disables the toolbar")); - viewPhrasebookBar = new KToggleAction (i18n("Show P&hrasebook Bar"), 0, 0, this, TQT_SLOT(slotViewPhrasebookBar()), actionCollection(), "showPhrasebookBar"); + viewPhrasebookBar = new KToggleAction (i18n("Show P&hrasebook Bar"), 0, 0, TQT_TQOBJECT(this), TQT_SLOT(slotViewPhrasebookBar()), actionCollection(), "showPhrasebookBar"); viewPhrasebookBar->setStatusText(i18n("Enables/disables the phrasebook bar")); viewPhrasebookBar->setWhatsThis (i18n("Enables/disables the phrasebook bar")); - viewStatusBar = KStdAction::showStatusbar(this, TQT_SLOT(slotViewStatusBar()), actionCollection()); + viewStatusBar = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotViewStatusBar()), actionCollection()); viewStatusBar->setStatusText(i18n("Enables/disables the statusbar")); viewStatusBar->setWhatsThis (i18n("Enables/disables the statusbar")); - configureTTS = new KAction (i18n("&Configure KMouth..."), "configure", 0, this, TQT_SLOT(slotConfigureTTS()), actionCollection(), "configureTTS"); + configureTTS = new KAction (i18n("&Configure KMouth..."), "configure", 0, TQT_TQOBJECT(this), TQT_SLOT(slotConfigureTTS()), actionCollection(), "configureTTS"); configureTTS->setStatusText(i18n("Opens the configuration dialog")); configureTTS->setWhatsThis (i18n("Opens the configuration dialog")); @@ -153,27 +153,27 @@ void KMouthApp::initActions() { // The "Help" menu will automatically get created. // The popup menu of the list of spoken sentences - phraseListSpeak = new KAction (i18n("&Speak"), "speak", 0, phraseList, TQT_SLOT(speakListSelection()), actionCollection(), "phraselist_speak"); + phraseListSpeak = new KAction (i18n("&Speak"), "speak", 0, TQT_TQOBJECT(phraseList), TQT_SLOT(speakListSelection()), actionCollection(), "phraselist_speak"); phraseListSpeak->setStatusText(i18n("Speaks the currently selected phrases in the history")); phraseListSpeak->setWhatsThis (i18n("Speaks the currently selected phrases in the history")); - phraseListRemove = new KAction (i18n("&Delete"), "editdelete", 0, phraseList, TQT_SLOT(removeListSelection()), actionCollection(), "phraselist_remove"); + phraseListRemove = new KAction (i18n("&Delete"), "editdelete", 0, TQT_TQOBJECT(phraseList), TQT_SLOT(removeListSelection()), actionCollection(), "phraselist_remove"); phraseListRemove->setStatusText(i18n("Deletes the currently selected phrases from the history")); phraseListRemove->setWhatsThis (i18n("Deletes the currently selected phrases from the history")); - phraseListCut = new KAction (i18n("Cu&t"), "editcut", 0, phraseList, TQT_SLOT(cutListSelection()), actionCollection(), "phraselist_cut"); + phraseListCut = new KAction (i18n("Cu&t"), "editcut", 0, TQT_TQOBJECT(phraseList), TQT_SLOT(cutListSelection()), actionCollection(), "phraselist_cut"); phraseListCut->setStatusText(i18n("Cuts the currently selected phrases from the history and puts them to the clipboard")); phraseListCut->setWhatsThis (i18n("Cuts the currently selected phrases from the history and puts them to the clipboard")); - phraseListCopy = new KAction (i18n("&Copy"), "editcopy", 0, phraseList, TQT_SLOT(copyListSelection()), actionCollection(), "phraselist_copy"); + phraseListCopy = new KAction (i18n("&Copy"), "editcopy", 0, TQT_TQOBJECT(phraseList), TQT_SLOT(copyListSelection()), actionCollection(), "phraselist_copy"); phraseListCut->setStatusText(i18n("Copies the currently selected phrases from the history to the clipboard")); phraseListCut->setWhatsThis (i18n("Copies the currently selected phrases from the history to the clipboard")); - phraselistSelectAll = new KAction (i18n("Select &All Entries"), 0, 0, phraseList, TQT_SLOT(selectAllEntries()), actionCollection(),"phraselist_select_all"); + phraselistSelectAll = new KAction (i18n("Select &All Entries"), 0, 0, TQT_TQOBJECT(phraseList), TQT_SLOT(selectAllEntries()), actionCollection(),"phraselist_select_all"); phraselistSelectAll->setStatusText(i18n("Selects all phrases in the history")); phraselistSelectAll->setWhatsThis (i18n("Selects all phrases in the history")); - phraselistDeselectAll = new KAction (i18n("D&eselect All Entries"), 0, 0, phraseList, TQT_SLOT(deselectAllEntries()), actionCollection(),"phraselist_deselect_all"); + phraselistDeselectAll = new KAction (i18n("D&eselect All Entries"), 0, 0, TQT_TQOBJECT(phraseList), TQT_SLOT(deselectAllEntries()), actionCollection(),"phraselist_deselect_all"); phraselistDeselectAll->setStatusText(i18n("Deselects all phrases in the history")); phraselistDeselectAll->setWhatsThis (i18n("Deselects all phrases in the history")); @@ -458,7 +458,7 @@ void KMouthApp::slotPhrasebookConfirmed (PhraseBook &book) { delete phrases; phrases = new KActionCollection (this, actionCollection()); - book.addToGUI (popup, toolbar, phrases, this, TQT_SLOT(slotPhraseSelected (const TQString &))); + book.addToGUI (popup, toolbar, phrases, TQT_TQOBJECT(this), TQT_SLOT(slotPhraseSelected (const TQString &))); TQString bookLocation = KApplication::kApplication()->dirs()->saveLocation ("appdata", "/"); if (!bookLocation.isNull() && !bookLocation.isEmpty()) { diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h index ba7756d..e9b18f4 100644 --- a/kmouth/kmouth.h +++ b/kmouth/kmouth.h @@ -24,7 +24,7 @@ #include <config.h> #endif -// include files for Qt +// include files for TQt // include files for KDE #include <kapplication.h> @@ -56,11 +56,12 @@ class PhraseBook; class KMouthApp : public KMainWindow { Q_OBJECT + TQ_OBJECT public: /** construtor of KMouthApp, calls all init functions to create the application. */ - KMouthApp(TQWidget* parent=0, const char* name=0); + KMouthApp(TQWidget* tqparent=0, const char* name=0); ~KMouthApp(); /** Returns true if the configuration wizard was not needed or when it * was successfully completed. @@ -78,7 +79,7 @@ class KMouthApp : public KMainWindow void enableMenuEntries(bool existSelectedEntries, bool existDeselectedEntries); protected: - /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration + /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration * file */ void saveOptions(); diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp index a16e1e4..ad98fda 100644 --- a/kmouth/optionsdialog.cpp +++ b/kmouth/optionsdialog.cpp @@ -39,8 +39,8 @@ #include "texttospeechconfigurationwidget.h" #include "speech.h" -PreferencesWidget::PreferencesWidget (TQWidget *parent, const char *name) - : PreferencesUI (parent, name) +PreferencesWidget::PreferencesWidget (TQWidget *tqparent, const char *name) + : PreferencesUI (tqparent, name) { speakCombo->setCurrentItem (1); speak = false; @@ -113,27 +113,27 @@ bool PreferencesWidget::isSpeakImmediately () { /***************************************************************************/ -OptionsDialog::OptionsDialog (TQWidget *parent) +OptionsDialog::OptionsDialog (TQWidget *tqparent) : KDialogBase(IconList, i18n("Configuration"), Ok|Apply|Cancel|Help, Ok, - parent, "configuration", false, true) + tqparent, "configuration", false, true) { setHelp ("config-dialog"); TQPixmap iconGeneral = KGlobal::iconLoader()->loadIcon("configure", KIcon::NoGroup, KIcon::SizeMedium); - TQGrid *pageGeneral = addGridPage (1, Qt::Horizontal, i18n("General Options"), TQString::null, iconGeneral); + TQGrid *pageGeneral = addGridPage (1, Qt::Horizontal, i18n("General Options"), TQString(), iconGeneral); tabCtl = new TQTabWidget (pageGeneral, "general"); behaviourWidget = new PreferencesWidget (tabCtl, "prefPage"); - behaviourWidget->layout()->setMargin(KDialog::marginHint()); + behaviourWidget->tqlayout()->setMargin(KDialog::marginHint()); tabCtl->addTab (behaviourWidget, i18n("&Preferences")); commandWidget = new TextToSpeechConfigurationWidget (tabCtl, "ttsTab"); - commandWidget->layout()->setMargin(KDialog::marginHint()); + commandWidget->tqlayout()->setMargin(KDialog::marginHint()); tabCtl->addTab (commandWidget, i18n("&Text-to-Speech")); TQPixmap iconCompletion = KGlobal::iconLoader()->loadIcon("keyboard", KIcon::NoGroup, KIcon::SizeMedium); - TQGrid *pageCompletion = addGridPage (1, Qt::Horizontal, i18n("Word Completion"), TQString::null, iconCompletion); + TQGrid *pageCompletion = addGridPage (1, Qt::Horizontal, i18n("Word Completion"), TQString(), iconCompletion); completionWidget = new WordCompletionWidget(pageCompletion, "Word Completion widget"); kttsd = loadKttsd(); diff --git a/kmouth/optionsdialog.h b/kmouth/optionsdialog.h index 30f635d..ac50f7d 100644 --- a/kmouth/optionsdialog.h +++ b/kmouth/optionsdialog.h @@ -33,8 +33,9 @@ class WordCompletionWidget; class PreferencesWidget : public PreferencesUI { Q_OBJECT + TQ_OBJECT public: - PreferencesWidget(TQWidget *parent, const char *name); + PreferencesWidget(TQWidget *tqparent, const char *name); ~PreferencesWidget(); void readOptions (KConfig *config); @@ -56,8 +57,9 @@ private: class OptionsDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - OptionsDialog(TQWidget *parent); + OptionsDialog(TQWidget *tqparent); ~OptionsDialog(); void slotCancel(); diff --git a/kmouth/phrasebook/buttonboxui.ui b/kmouth/phrasebook/buttonboxui.ui index abc999b..d2b5d00 100644 --- a/kmouth/phrasebook/buttonboxui.ui +++ b/kmouth/phrasebook/buttonboxui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>ButtonBoxUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>ButtonBoxUI</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>phrasebox</cstring> </property> @@ -42,7 +42,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QWidget" row="3" column="2"> + <widget class="TQWidget" row="3" column="2"> <property name="name"> <cstring>keyButtonPlace</cstring> </property> @@ -55,7 +55,7 @@ <string>With this line edit you define the name of a sub-phrasebook or the contents of a phrase.</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>noKey</cstring> </property> @@ -66,7 +66,7 @@ <string>If you select this option then the selected phrase will not be reachable by a keyboard shortcut.</string> </property> </widget> - <widget class="QRadioButton" row="3" column="1"> + <widget class="TQRadioButton" row="3" column="1"> <property name="name"> <cstring>customKey</cstring> </property> @@ -77,7 +77,7 @@ <string>If you select this option then the selected phrase will be reachable by a keyboard shortcut. You can change the shortcut with the button next to this option.</string> </property> </widget> - <widget class="QLabel" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>shortcutLabel</cstring> </property> @@ -85,7 +85,7 @@ <string>Shortcut for the phrase:</string> </property> </widget> - <widget class="QLabel" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>textLabel</cstring> </property> @@ -103,5 +103,5 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp index cc5d900..2efc2e6 100644 --- a/kmouth/phrasebook/phrasebook.cpp +++ b/kmouth/phrasebook/phrasebook.cpp @@ -109,7 +109,7 @@ void PhraseBook::print(KPrinter *pPrinter) { for (it = begin(); it != end(); ++it) { TQRect rect = metrics.boundingRect (x+16*(*it).getLevel(), y, w-16*(*it).getLevel(), 0, - Qt::AlignJustify | Qt::WordBreak, + TQt::AlignJustify | TQt::WordBreak, (*it).getPhrase().getPhrase()); if (y+rect.height() > size.height()) { @@ -118,7 +118,7 @@ void PhraseBook::print(KPrinter *pPrinter) { } printpainter.drawText (x+16*(*it).getLevel(),y, w-16*(*it).getLevel(),rect.height(), - Qt::AlignJustify | Qt::WordBreak, + TQt::AlignJustify | TQt::WordBreak, (*it).getPhrase().getPhrase()); y += rect.height(); } @@ -151,7 +151,7 @@ TQCString encodeString (const TQString str) { TQCString res = ""; for (int i = 0; i < (int)str.length(); i++) { TQChar ch = str.at(i); - ushort uc = ch.unicode(); + ushort uc = ch.tqunicode(); TQCString number; number.setNum(uc); if ((uc>127) || (uc<32) || (ch=='<') || (ch=='>') || (ch=='&') || (ch==';')) res = res + "&#" + number + ";"; @@ -249,7 +249,7 @@ bool PhraseBook::save (const KURL &url, bool asPhrasebook) { } } -int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool phrasebookFirst) { +int PhraseBook::save (TQWidget *tqparent, 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 *parent, const TQString &title, KURL &url, bool p else filters = i18n("*.txt|Plain Text Files (*.txt)\n*.phrasebook|Phrase Books (*.phrasebook)\n*|All Files"); - KFileDialog fdlg(TQString::null,filters, parent, "filedialog", true); + KFileDialog fdlg(TQString(),filters, tqparent, "filedialog", true); fdlg.setCaption(title); fdlg.setOperationMode( KFileDialog::Saving ); @@ -274,20 +274,20 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p } if (KIO::NetAccess::exists(url)) { - if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. " - "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) { + if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. " + "Do you want to overwrite it?").tqarg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) { return 0; } } bool result; if (fdlg.currentFilter() == "*.phrasebook") { - if (url.fileName (false).contains('.') == 0) { + if (url.fileName (false).tqcontains('.') == 0) { url.setFileName (url.fileName(false) + ".phrasebook"); } - else if (url.fileName (false).right (11).contains (".phrasebook", false) == 0) { - int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").arg(i18n("Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>. " - "Do you wish to add <i>.phrasebook</i> to the filename?").arg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add")); + else if (url.fileName (false).right (11).tqcontains (".phrasebook", false) == 0) { + int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").tqarg(i18n("Your chosen filename <i>%1</i> has a different extension than <i>.phrasebook</i>. " + "Do you wish to add <i>.phrasebook</i> to the filename?").tqarg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add")); if (filetype == KMessageBox::Cancel) { return 0; } @@ -298,12 +298,12 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p result = save (url, true); } else if (fdlg.currentFilter() == "*.txt") { - if (url.fileName (false).right (11).contains (".phrasebook", false) == 0) { + if (url.fileName (false).right (11).tqcontains (".phrasebook", false) == 0) { result = save (url, false); } else { - int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").arg(i18n("Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>. " - "Do you wish to save in phrasebook format?").arg(url.filename())),i18n("File Extension"),i18n("As Phrasebook"),i18n("As Plain Text")); + int filetype = KMessageBox::questionYesNoCancel (0,TQString("<qt>%1</qt>").tqarg(i18n("Your chosen filename <i>%1</i> has the extension <i>.phrasebook</i>. " + "Do you wish to save in phrasebook format?").tqarg(url.filename())),i18n("File Extension"),i18n("As Phrasebook"),i18n("As Plain Text")); if (filetype == KMessageBox::Cancel) { return 0; } @@ -339,7 +339,7 @@ bool PhraseBook::open (const KURL &url) { // First: try to load it as a normal phrase book TQFile file(tempFile); - TQXmlInputSource source (&file); + TQXmlInputSource source (TQT_TQIODEVICE(&file)); bool error = !decode (source); // Second: if the file does not contain a phrase book, load it as @@ -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 *parent = popup; + TQWidget *tqparent = 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 (parent); - if (parent == popup) + menu->plug (tqparent); + if (tqparent == popup) menu->plug (toolbar); - if (parent != 0) - stack.push (parent); - parent = menu->popupMenu(); + if (tqparent != 0) + stack.push (tqparent); + tqparent = menu->popupMenu(); level++; } - while (newLevel < level && (parent != popup)) { - parent = stack.pop(); + while (newLevel < level && (tqparent != popup)) { + tqparent = stack.pop(); level--; } if ((*it).isPhrase()) { Phrase phrase = (*it).getPhrase(); KAction *action = new PhraseAction (phrase.getPhrase(), phrase.getShortcut(), receiver, slot, phrases); - if (parent == popup) + if (tqparent == popup) action->plug (toolbar); - if (parent != 0) - action->plug(parent); + if (tqparent != 0) + action->plug(tqparent); } else { Phrase phrase = (*it).getPhrase(); KActionMenu *menu = new KActionMenu(phrase.getPhrase(), "phrasebook"); menu->setDelayed(false); phrases->insert(menu); - if (parent == popup) + if (tqparent == popup) menu->plug (toolbar); - if (parent != 0) - menu->plug (parent); - stack.push (parent); - parent = menu->popupMenu(); + if (tqparent != 0) + menu->plug (tqparent); + stack.push (tqparent); + tqparent = menu->popupMenu(); level++; } } @@ -451,9 +451,9 @@ PhraseBookDrag::~PhraseBookDrag () { void PhraseBookDrag::setBook (PhraseBook *book) { if (book == 0) { isEmpty = true; - xmlphrasebook.setText(TQString::null); - xml.setText(TQString::null); - plain.setText(TQString::null); + xmlphrasebook.setText(TQString()); + xml.setText(TQString()); + plain.setText(TQString()); } else { isEmpty = false; @@ -477,15 +477,15 @@ const char *PhraseBookDrag::format (int i) const { return xmlphrasebook.format(i/3); } -TQByteArray PhraseBookDrag::encodedData (const char* mime) const { +TQByteArray PhraseBookDrag::tqencodedData (const char* mime) const { TQCString m(mime); m = m.lower(); - if (m.contains("xml-phrasebook")) - return xmlphrasebook.encodedData(mime); - else if (m.contains("xml")) - return xml.encodedData(mime); + if (m.tqcontains("xml-phrasebook")) + return xmlphrasebook.tqencodedData(mime); + else if (m.tqcontains("xml")) + return xml.tqencodedData(mime); else - return plain.encodedData(mime); + return plain.tqencodedData(mime); } bool PhraseBookDrag::canDecode (const TQMimeSource* e) { diff --git a/kmouth/phrasebook/phrasebook.h b/kmouth/phrasebook/phrasebook.h index b0133b1..eb19ea2 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 *parent, const TQString &title, KURL &url, bool phrasebookFirst = true); + int save (TQWidget *tqparent, const TQString &title, KURL &url, bool phrasebookFirst = true); /** encodes the phrase book. Returns the encoded xml code. */ TQString encode (); @@ -148,6 +148,7 @@ public: */ class PhraseBookDrag: public TQDragObject { Q_OBJECT + TQ_OBJECT public: PhraseBookDrag (PhraseBook *book, TQWidget *dragSource = 0, const char *name = 0); PhraseBookDrag (TQWidget *dragSource = 0, const char *name = 0); @@ -156,7 +157,7 @@ public: virtual void setBook (PhraseBook *book); const char *format (int i) const; - virtual TQByteArray encodedData (const char *) const; + virtual TQByteArray tqencodedData (const char *) const; static bool canDecode (const TQMimeSource *e); static bool decode (const TQMimeSource *e, PhraseBook *book); @@ -170,9 +171,10 @@ private: class PhraseAction : public KAction { Q_OBJECT + TQ_OBJECT public: - 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()) { + 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()) { 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 2abe3d0..6e4deda 100644 --- a/kmouth/phrasebook/phrasebookdialog.cpp +++ b/kmouth/phrasebook/phrasebookdialog.cpp @@ -53,9 +53,9 @@ namespace PhraseBookPrivate { }; } -CheckBookItem::CheckBookItem (TQListViewItem *parent, TQListViewItem *last, +CheckBookItem::CheckBookItem (TQListViewItem *tqparent, TQListViewItem *last, const TQString &text, const TQString &name, const TQString &filename) - : TQCheckListItem (parent, text, TQCheckListItem::CheckBox) + : TQCheckListItem (tqparent, text, TQCheckListItem::CheckBox) { moveItem (last); setText(PhraseBookPrivate::name, name); @@ -67,12 +67,12 @@ CheckBookItem::CheckBookItem (TQListViewItem *parent, TQListViewItem *last, else numberOfBooks = 1; selectedBooks = 0; - ((CheckBookItem*)parent)->childChange (numberOfBooks, selectedBooks); + ((CheckBookItem*)tqparent)->childChange (numberOfBooks, selectedBooks); } -CheckBookItem::CheckBookItem (TQListView *parent, TQListViewItem *last, +CheckBookItem::CheckBookItem (TQListView *tqparent, TQListViewItem *last, const TQString &text, const TQString &name, const TQString &filename) - : TQCheckListItem (parent, text, TQCheckListItem::CheckBox) + : TQCheckListItem (tqparent, 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 *parent = this->parent(); - if (parent != 0) { + TQListViewItem *tqparent = this->tqparent(); + if (tqparent != 0) { if (on) - ((CheckBookItem*)parent)->childChange (0, 1); + ((CheckBookItem*)tqparent)->childChange (0, 1); else - ((CheckBookItem*)parent)->childChange (0, -1); + ((CheckBookItem*)tqparent)->childChange (0, -1); } } else propagateStateChange(); @@ -127,19 +127,19 @@ void CheckBookItem::propagateStateChange () { void CheckBookItem::childChange (int numberDiff, int selDiff) { numberOfBooks += numberDiff; selectedBooks += selDiff; - TQListViewItem *parent = this->parent(); - if (parent != 0) - ((CheckBookItem*)parent)->childChange (numberDiff, selDiff); + TQListViewItem *tqparent = this->tqparent(); + if (tqparent != 0) + ((CheckBookItem*)tqparent)->childChange (numberDiff, selDiff); TQString text = i18n(" (%1 of %2 books selected)"); - text = text.arg(selectedBooks).arg(numberOfBooks); + text = text.tqarg(selectedBooks).tqarg(numberOfBooks); setText(0, this->text(PhraseBookPrivate::name)+text); } /***************************************************************************/ -InitialPhraseBookWidget::InitialPhraseBookWidget (TQWidget *parent, const char *name) - : TQWidget(parent, name) +InitialPhraseBookWidget::InitialPhraseBookWidget (TQWidget *tqparent, const char *name) + : TQWidget(tqparent, 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 *parent = 0; + TQListViewItem *tqparent = 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 = parent; - parent = stack.pop(); + last = tqparent; + tqparent = stack.pop(); } for (; it2 != dirs.end(); ++it2) { - stack.push (parent); + stack.push (tqparent); TQListViewItem *newParent; - if (parent == 0) - newParent = new CheckBookItem (books, last, *it2, *it2, TQString::null); + if (tqparent == 0) + newParent = new CheckBookItem (books, last, *it2, *it2, TQString()); else - newParent = new CheckBookItem (parent, last, *it2, *it2, TQString::null); - parent = newParent; + newParent = new CheckBookItem (tqparent, last, *it2, *it2, TQString()); + tqparent = newParent; last = 0; } currentNamePath = dirs; TQListViewItem *book; - if (parent == 0) + if (tqparent == 0) book = new CheckBookItem (books, last, (*it).name, (*it).name, (*it).filename); else - book = new CheckBookItem (parent, last, (*it).name, (*it).name, (*it).filename); + book = new CheckBookItem (tqparent, last, (*it).name, (*it).name, (*it).filename); last = book; } } @@ -218,7 +218,7 @@ void InitialPhraseBookWidget::createBook () { } while ((item != 0) && (item->nextSibling() == 0)) { - item = item->parent(); + item = item->tqparent(); } if (item != 0) item = item->nextSibling(); @@ -233,8 +233,8 @@ void InitialPhraseBookWidget::createBook () { /***************************************************************************/ -ButtonBoxWidget::ButtonBoxWidget (TQWidget *parent, const char *name) -: ButtonBoxUI (parent, name) { +ButtonBoxWidget::ButtonBoxWidget (TQWidget *tqparent, const char *name) +: ButtonBoxUI (tqparent, name) { keyButtonPlaceLayout = new TQGridLayout (keyButtonPlace, 1, 1, 0, 0, "keyButtonPlaceLayout"); keyButton = new KKeyButton (keyButtonPlace, "key"); @@ -303,10 +303,10 @@ void PhraseBookDialog::initGUI () { treeView->setAllColumnsShowFocus (true); treeView->setSelectionMode (TQListView::Extended); TQWhatsThis::add (treeView, i18n("This list contains the current phrase book in a tree structure. You can select and modify individual phrases and sub phrase books")); - connect (treeView, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged())); - connect (treeView, TQT_SIGNAL(contextMenuRequested (TQListViewItem *, const TQPoint &, int)), this, TQT_SLOT(contextMenuRequested (TQListViewItem *, const TQPoint &, int))); - connect (treeView, TQT_SIGNAL(dropped (TQDropEvent *, TQListViewItem *, TQListViewItem *)), this, TQT_SLOT(slotDropped (TQDropEvent *, TQListViewItem *, TQListViewItem *))); - connect (treeView, TQT_SIGNAL(moved (TQListViewItem *, TQListViewItem *, TQListViewItem *)), this, TQT_SLOT(slotMoved (TQListViewItem *, TQListViewItem *, TQListViewItem *))); + connect (treeView, TQT_SIGNAL(selectionChanged()), TQT_TQOBJECT(this), TQT_SLOT(selectionChanged())); + connect (treeView, TQT_SIGNAL(contextMenuRequested (TQListViewItem *, const TQPoint &, int)), TQT_TQOBJECT(this), TQT_SLOT(contextMenuRequested (TQListViewItem *, const TQPoint &, int))); + connect (treeView, TQT_SIGNAL(dropped (TQDropEvent *, TQListViewItem *, TQListViewItem *)), TQT_TQOBJECT(this), TQT_SLOT(slotDropped (TQDropEvent *, TQListViewItem *, TQListViewItem *))); + connect (treeView, TQT_SIGNAL(moved (TQListViewItem *, TQListViewItem *, TQListViewItem *)), TQT_TQOBJECT(this), TQT_SLOT(slotMoved (TQListViewItem *, TQListViewItem *, TQListViewItem *))); mainLayout->addWidget (treeView); buttonBox = new ButtonBoxWidget (page, "buttonbox"); @@ -322,23 +322,23 @@ void PhraseBookDialog::initGUI () { void PhraseBookDialog::initActions() { // The file menu - fileNewPhrase = new KAction (i18n("&New Phrase"), "phrase_new", 0, this, TQT_SLOT(slotAddPhrase()), actionCollection(),"file_new_phrase"); + fileNewPhrase = new KAction (i18n("&New Phrase"), "phrase_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddPhrase()), actionCollection(),"file_new_phrase"); fileNewPhrase->setStatusText(i18n("Adds a new phrase")); fileNewPhrase->setWhatsThis (i18n("Adds a new phrase")); - fileNewBook = new KAction (i18n("New Phrase &Book"), "phrasebook_new", 0, this, TQT_SLOT(slotAddPhrasebook()), actionCollection(),"file_new_book"); + fileNewBook = new KAction (i18n("New Phrase &Book"), "phrasebook_new", 0, TQT_TQOBJECT(this), TQT_SLOT(slotAddPhrasebook()), actionCollection(),"file_new_book"); fileNewBook->setStatusText(i18n("Adds a new phrase book into which other books and phrases can be placed")); fileNewBook->setWhatsThis (i18n("Adds a new phrase book into which other books and phrases can be placed")); - fileSave = KStdAction::save(this, TQT_SLOT(slotSave()), actionCollection()); + fileSave = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotSave()), actionCollection()); fileSave->setStatusText(i18n("Saves the phrase book onto the hard disk")); fileSave->setWhatsThis (i18n("Saves the phrase book onto the hard disk")); - fileImport = new KAction (i18n("&Import..."), "phrasebook_open", 0, this, TQT_SLOT(slotImportPhrasebook()), actionCollection(),"file_import"); + fileImport = new KAction (i18n("&Import..."), "phrasebook_open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportPhrasebook()), actionCollection(),"file_import"); fileImport->setStatusText(i18n("Imports a file and adds its contents to the phrase book")); fileImport->setWhatsThis (i18n("Imports a file and adds its contents to the phrase book")); - toolbarImport = new KToolBarPopupAction (i18n("&Import..."), "phrasebook_open", 0, this, TQT_SLOT(slotImportPhrasebook()), actionCollection(),"toolbar_import"); + toolbarImport = new KToolBarPopupAction (i18n("&Import..."), "phrasebook_open", 0, TQT_TQOBJECT(this), TQT_SLOT(slotImportPhrasebook()), actionCollection(),"toolbar_import"); toolbarImport->setStatusText(i18n("Imports a file and adds its contents to the phrase book")); toolbarImport->setWhatsThis (i18n("Imports a file and adds its contents to the phrase book")); @@ -346,32 +346,32 @@ void PhraseBookDialog::initActions() { fileImportStandardBook->setStatusText(i18n("Imports a standard phrase book and adds its contents to the phrase book")); fileImportStandardBook->setWhatsThis (i18n("Imports a standard phrase book and adds its contents to the phrase book")); - fileExport = new KAction (i18n("&Export..."), "phrasebook_save", 0, this, TQT_SLOT(slotExportPhrasebook()), actionCollection(),"file_export"); + fileExport = new KAction (i18n("&Export..."), "phrasebook_save", 0, TQT_TQOBJECT(this), TQT_SLOT(slotExportPhrasebook()), actionCollection(),"file_export"); fileExport->setStatusText(i18n("Exports the currently selected phrase(s) or phrase book(s) into a file")); fileExport->setWhatsThis (i18n("Exports the currently selected phrase(s) or phrase book(s) into a file")); - filePrint = KStdAction::print(this, TQT_SLOT(slotPrint()), actionCollection()); + filePrint = KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT(slotPrint()), actionCollection()); filePrint->setStatusText(i18n("Prints the currently selected phrase(s) or phrase book(s)")); filePrint->setWhatsThis (i18n("Prints the currently selected phrase(s) or phrase book(s)")); - fileClose = KStdAction::close(this, TQT_SLOT(close()), actionCollection()); + fileClose = KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection()); fileClose->setStatusText(i18n("Closes the window")); fileClose->setWhatsThis (i18n("Closes the window")); // The edit menu - editCut = KStdAction::cut(this, TQT_SLOT(slotCut()), actionCollection()); + editCut = KStdAction::cut(TQT_TQOBJECT(this), TQT_SLOT(slotCut()), actionCollection()); editCut->setStatusText(i18n("Cuts the currently selected entries from the phrase book and puts it to the clipboard")); editCut->setWhatsThis (i18n("Cuts the currently selected entries from the phrase book and puts it to the clipboard")); - editCopy = KStdAction::copy(this, TQT_SLOT(slotCopy()), actionCollection()); + editCopy = KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(slotCopy()), actionCollection()); editCopy->setStatusText(i18n("Copies the currently selected entry from the phrase book to the clipboard")); editCopy->setWhatsThis (i18n("Copies the currently selected entry from the phrase book to the clipboard")); - editPaste = KStdAction::paste(this, TQT_SLOT(slotPaste()), actionCollection()); + editPaste = KStdAction::paste(TQT_TQOBJECT(this), TQT_SLOT(slotPaste()), actionCollection()); editPaste->setStatusText(i18n("Pastes the clipboard contents to actual position")); editPaste->setWhatsThis (i18n("Pastes the clipboard contents to actual position")); - editDelete = new KAction (i18n("&Delete"), "editdelete", 0, this, TQT_SLOT(slotRemove()), actionCollection(),"edit_delete"); + editDelete = new KAction (i18n("&Delete"), "editdelete", 0, TQT_TQOBJECT(this), TQT_SLOT(slotRemove()), actionCollection(),"edit_delete"); editDelete->setStatusText(i18n("Deletes the selected entries from the phrase book")); editDelete->setWhatsThis (i18n("Deletes the selected entries from the phrase book")); @@ -383,7 +383,7 @@ TQString PhraseBookDialog::displayPath (TQString filename) { TQFileInfo file(filename); TQString path = file.dirPath(); TQString dispPath = ""; - uint position = path.find("/kmouth/books/")+TQString("/kmouth/books/").length(); + uint position = path.tqfind("/kmouth/books/")+TQString("/kmouth/books/").length(); while (path.length() > position) { file.setFile(path); @@ -434,7 +434,7 @@ StandardBookList PhraseBookDialog::standardPhraseBooks() { void PhraseBookDialog::initStandardPhraseBooks () { StandardBookList bookPaths = standardPhraseBooks(); - KActionMenu *parent = fileImportStandardBook; + KActionMenu *tqparent = 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) - parent = stack.pop(); + tqparent = stack.pop(); for (; it2 != dirs.end(); ++it2) { - stack.push (parent); + stack.push (tqparent); KActionMenu *newParent = new KActionMenu (*it2); - parent->insert(newParent); - if (parent == fileImportStandardBook) + tqparent->insert(newParent); + if (tqparent == fileImportStandardBook) newParent->plug(toolbarImport->popupMenu()); - parent = newParent; + tqparent = newParent; } currentNamePath = dirs; KAction *book = new StandardPhraseBookInsertAction ( - url, (*it).name, this, TQT_SLOT(slotImportPhrasebook (const KURL &)), actionCollection()); - parent->insert(book); - if (parent == fileImportStandardBook) + url, (*it).name, TQT_TQOBJECT(this), TQT_SLOT(slotImportPhrasebook (const KURL &)), actionCollection()); + tqparent->insert(book); + if (tqparent == fileImportStandardBook) book->plug(toolbarImport->popupMenu()); } } @@ -567,7 +567,7 @@ void PhraseBookDialog::slotNoKey() { PhraseTreeItem *currentItem = selectedItem (treeView); if (currentItem != 0) { - currentItem->setCut (KShortcut(TQString::null)); + currentItem->setCut (KShortcut(TQString())); buttonBox->keyButton->setShortcut(currentItem->cut(), false); } phrasebookChanged = true; @@ -597,7 +597,7 @@ void PhraseBookDialog::setShortcut( const KShortcut& cut ) { { TQString s = i18n("In order to use the '%1' key as a shortcut, " "it must be combined with the " - "Win, Alt, Ctrl, and/or Shift keys.").arg(TQChar(key.sym())); + "Win, Alt, Ctrl, and/or Shift keys.").tqarg(TQChar(key.sym())); KMessageBox::sorry( this, s, i18n("Invalid Shortcut Key") ); return; } @@ -615,8 +615,8 @@ void PhraseBookDialog::setShortcut( const KShortcut& cut ) { } } -TQListViewItem *PhraseBookDialog::addBook (TQListViewItem *parent, TQListViewItem *after, PhraseBook *book) { - TQListViewItem *newItem = treeView->addBook(parent, after, book); +TQListViewItem *PhraseBookDialog::addBook (TQListViewItem *tqparent, TQListViewItem *after, PhraseBook *book) { + TQListViewItem *newItem = treeView->addBook(tqparent, 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->parent() != 0) - return addBook(item->parent(), item, book); + if (item->tqparent() != 0) + return addBook(item->tqparent(), item, book); else return addBook(0, item, book); else @@ -667,20 +667,20 @@ void PhraseBookDialog::slotCut () { void PhraseBookDialog::slotCopy () { PhraseBook book; treeView->fillBook (&book, true); - TQApplication::clipboard()->setData(new PhraseBookDrag(&book)); + TQApplication::tqclipboard()->setData(new PhraseBookDrag(&book)); } void PhraseBookDialog::slotPaste () { PhraseBook book; - if (PhraseBookDrag::decode(TQApplication::clipboard()->data(), &book)) { + if (PhraseBookDrag::decode(TQApplication::tqclipboard()->data(), &book)) { addBook (treeView->currentItem(), &book); } } -void PhraseBookDialog::slotDropped (TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after) { +void PhraseBookDialog::slotDropped (TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *after) { PhraseBook book; if (PhraseBookDrag::decode(e, &book)) { - addBook(parent, after, &book); + addBook(tqparent, after, &book); } } @@ -719,7 +719,7 @@ void PhraseBookDialog::slotSave () { } void PhraseBookDialog::slotImportPhrasebook () { - KURL url=KFileDialog::getOpenURL(TQString::null, + KURL url=KFileDialog::getOpenURL(TQString(), i18n("*.phrasebook|Phrase Books (*.phrasebook)\n*.txt|Plain Text Files (*.txt)\n*|All Files"), this, i18n("Import Phrasebook")); slotImportPhrasebook (url); @@ -731,7 +731,7 @@ void PhraseBookDialog::slotImportPhrasebook (const KURL &url) { if (book.open (url)) addBook(treeView->currentItem(), &book); else - KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() )); + KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() )); } } @@ -741,7 +741,7 @@ void PhraseBookDialog::slotExportPhrasebook () { KURL url; if (book.save (this, i18n("Export Phrase Book"), url) == -1) - KMessageBox::sorry(this,i18n("There was an error saving file\n%1").arg( url.url() )); + KMessageBox::sorry(this,i18n("There was an error saving file\n%1").tqarg( url.url() )); } void PhraseBookDialog::slotPrint() diff --git a/kmouth/phrasebook/phrasebookdialog.h b/kmouth/phrasebook/phrasebookdialog.h index a3bc352..1a09a79 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 *parent, TQListViewItem *last, + CheckBookItem (TQListViewItem *tqparent, TQListViewItem *last, const TQString &text, const TQString &name, const TQString &filename); - CheckBookItem (TQListView *parent, TQListViewItem *last, + CheckBookItem (TQListView *tqparent, TQListViewItem *last, const TQString &text, const TQString &name, const TQString &filename); ~CheckBookItem(); @@ -74,8 +74,9 @@ private: class InitialPhraseBookWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: - InitialPhraseBookWidget(TQWidget *parent, const char *name); + InitialPhraseBookWidget(TQWidget *tqparent, const char *name); ~InitialPhraseBookWidget(); void createBook(); @@ -94,9 +95,10 @@ private: */ class StandardPhraseBookInsertAction : public KAction { Q_OBJECT + TQ_OBJECT public: - StandardPhraseBookInsertAction (const KURL &url, const TQString& name, const TQObject* receiver, const char* slot, KActionCollection* parent) - : KAction (name, "phrasebook", 0, 0, 0, parent, 0) { + StandardPhraseBookInsertAction (const KURL &url, const TQString& name, const TQObject* receiver, const char* slot, KActionCollection* tqparent) + : KAction (name, "phrasebook", 0, 0, 0, tqparent, 0) { this->url = url; connect (this, TQT_SIGNAL(slotActivated (const KURL &)), receiver, slot); }; @@ -123,7 +125,7 @@ private: */ class ButtonBoxWidget : public ButtonBoxUI { public: - ButtonBoxWidget (TQWidget *parent = 0, const char *name = 0); + ButtonBoxWidget (TQWidget *tqparent = 0, const char *name = 0); ~ButtonBoxWidget (); KKeyButton *keyButton; @@ -141,6 +143,7 @@ protected: class PhraseBookDialog : public KMainWindow { friend class InitialPhraseBookWidget; Q_OBJECT + TQ_OBJECT private: /** Constructor. It is private because this class implements the singleton * pattern. For creating the instance of the dialog, use the get() method. @@ -184,7 +187,7 @@ public slots: void slotExportPhrasebook (); void slotPrint (); - void slotDropped (TQDropEvent *e, TQListViewItem *parent, TQListViewItem *after); + void slotDropped (TQDropEvent *e, TQListViewItem *tqparent, TQListViewItem *after); void slotMoved (TQListViewItem *item, TQListViewItem *, TQListViewItem *); signals: @@ -199,7 +202,7 @@ private: /** initializes the list of standard phrase books */ void initStandardPhraseBooks (); - TQListViewItem *addBook (TQListViewItem *parent, TQListViewItem *after, PhraseBook *book); + TQListViewItem *addBook (TQListViewItem *tqparent, TQListViewItem *after, PhraseBook *book); TQListViewItem *addBook (TQListViewItem *item, PhraseBook *book); void setShortcut (const KShortcut &cut); diff --git a/kmouth/phrasebook/phrasebookparser.h b/kmouth/phrasebook/phrasebookparser.h index a858b4f..fe9db9f 100644 --- a/kmouth/phrasebook/phrasebookparser.h +++ b/kmouth/phrasebook/phrasebookparser.h @@ -24,7 +24,7 @@ /** * This class implements a parser for both the phrase list and for phrase - * books. It is intended to be used together with the Qt SAX2 framework. + * books. It is intended to be used together with the TQt SAX2 framework. * @author Gunnar Schmi Dt */ diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp index 6ffbaee..dcd08c6 100644 --- a/kmouth/phrasebook/phrasetree.cpp +++ b/kmouth/phrasebook/phrasetree.cpp @@ -28,8 +28,8 @@ #include "phrasebookdialog.h" #include "phrasebook.h" -PhraseTreeItem::PhraseTreeItem (TQListView *parent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon) - : KListViewItem (parent, after, phrase) +PhraseTreeItem::PhraseTreeItem (TQListView *tqparent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon) + : KListViewItem (tqparent, after, phrase) { isPhraseValue = true; cutValue = shortcut; @@ -38,8 +38,8 @@ PhraseTreeItem::PhraseTreeItem (TQListView *parent, TQListViewItem *after, TQStr setExpandable (false); } -PhraseTreeItem::PhraseTreeItem (TQListViewItem *parent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon) - : KListViewItem (parent, after, phrase) +PhraseTreeItem::PhraseTreeItem (TQListViewItem *tqparent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon) + : KListViewItem (tqparent, after, phrase) { isPhraseValue = true; cutValue = shortcut; @@ -47,15 +47,15 @@ PhraseTreeItem::PhraseTreeItem (TQListViewItem *parent, TQListViewItem *after, T setPixmap(0, icon); setExpandable (false); } -PhraseTreeItem::PhraseTreeItem (TQListView *parent, TQListViewItem *after, TQString name, TQPixmap icon) - : KListViewItem (parent, after, name) +PhraseTreeItem::PhraseTreeItem (TQListView *tqparent, TQListViewItem *after, TQString name, TQPixmap icon) + : KListViewItem (tqparent, after, name) { isPhraseValue = false; setPixmap(0, icon); setExpandable (true); } -PhraseTreeItem::PhraseTreeItem (TQListViewItem *parent, TQListViewItem *after, TQString name, TQPixmap icon) - : KListViewItem (parent, after, name) +PhraseTreeItem::PhraseTreeItem (TQListViewItem *tqparent, TQListViewItem *after, TQString name, TQPixmap icon) + : KListViewItem (tqparent, after, name) { isPhraseValue = false; setPixmap(0, icon); @@ -74,8 +74,8 @@ void PhraseTreeItem::setCut (KShortcut cut) { // *************************************************************************** -PhraseTree::PhraseTree (TQWidget *parent, const char *name) - : KListView (parent, name) +PhraseTree::PhraseTree (TQWidget *tqparent, const char *name) + : KListView (tqparent, 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 *parent = item->parent(); + TQListViewItem *tqparent = item->tqparent(); TQListViewItem *above = item->itemAbove(); - if (above == parent) + if (above == tqparent) return 0; - while (above->parent() != parent) - above = above->parent(); + while (above->tqparent() != tqparent) + above = above->tqparent(); return above; } @@ -109,25 +109,25 @@ namespace PhraseTreePrivate { if (item == 0) return false; - TQListViewItem *parent = item->parent(); + TQListViewItem *tqparent = item->tqparent(); TQListViewItem *above = item->itemAbove(); if (above == 0) return false; - else if (above == parent) { - *newParent = parent->parent(); - *newAbove = prevSibling (parent); + else if (above == tqparent) { + *newParent = tqparent->tqparent(); + *newAbove = prevSibling (tqparent); return true; } - else if (above->parent() == parent) { - *newParent = parent; + else if (above->tqparent() == tqparent) { + *newParent = tqparent; *newAbove = prevSibling (above); return true; } else { - while (above->parent()->parent() != parent) - above = above->parent(); - *newParent = above->parent(); + while (above->tqparent()->tqparent() != tqparent) + above = above->tqparent(); + *newParent = above->tqparent(); *newAbove = above; return true; } @@ -140,14 +140,14 @@ namespace PhraseTreePrivate { if (item == 0) return false; - TQListViewItem *parent = item->parent(); + TQListViewItem *tqparent = item->tqparent(); TQListViewItem *below = item->nextSibling(); - if (parent == 0 && below == 0) + if (tqparent == 0 && below == 0) return false; - else if (parent != 0 && below == 0) { - *newParent = parent->parent(); - *newAbove = parent; + else if (tqparent != 0 && below == 0) { + *newParent = tqparent->tqparent(); + *newAbove = tqparent; return true; } else if (below->isOpen()) { @@ -156,7 +156,7 @@ namespace PhraseTreePrivate { return true; } else { - *newParent = parent; + *newParent = tqparent; *newAbove = below; return true; } @@ -195,32 +195,32 @@ namespace PhraseTreePrivate { if (item == 0) return false; - TQListViewItem *parent = item->parent(); + TQListViewItem *tqparent = item->tqparent(); - if (parent == 0) + if (tqparent == 0) return false; else { - *newParent = parent->parent(); - *newAbove = parent; + *newParent = tqparent->tqparent(); + *newAbove = tqparent; return true; } } } void PhraseTree::moveItem (TQListViewItem *item, - TQListViewItem *parent, + TQListViewItem *tqparent, TQListViewItem *above) { if (item != 0) { - if (item->parent() == 0) + if (item->tqparent() == 0) takeItem (item); else - item->parent()->takeItem (item); + item->tqparent()->takeItem (item); - if (parent == 0) + if (tqparent == 0) insertItem (item); else - parent->insertItem (item); + tqparent->insertItem (item); item->moveItem(above); } @@ -241,7 +241,7 @@ bool PhraseTree::hasSelectedItems() { } else { while ((i != 0) && (i->nextSibling() == 0)) { - i = i->parent(); + i = i->tqparent(); level--; } if (i != 0) @@ -267,7 +267,7 @@ void PhraseTree::deleteSelectedItems() { } else { while ((i != 0) && (i->nextSibling() == 0)) { - i = i->parent(); + i = i->tqparent(); } if (i != 0) i = i->nextSibling(); @@ -281,15 +281,15 @@ void PhraseTree::deleteSelectedItems() { } void PhraseTree::keyPressEvent (TQKeyEvent *e) { - if ((e->state() & Qt::KeyButtonMask) == Qt::AltButton) { - if (e->key() == Qt::Key_Up) { + if ((e->state() & TQt::KeyButtonMask) == TQt::AltButton) { + if (e->key() == TQt::Key_Up) { TQListViewItem *item = currentItem(); if ((item != 0) && (item->isSelected())) { - TQListViewItem *parent; + TQListViewItem *tqparent; TQListViewItem *above; - if (PhraseTreePrivate::findAbovePosition (item, &parent, &above)) { - moveItem(item, parent, above); + if (PhraseTreePrivate::findAbovePosition (item, &tqparent, &above)) { + moveItem(item, tqparent, above); setCurrentItem (item); item->setSelected(true); } @@ -297,14 +297,14 @@ void PhraseTree::keyPressEvent (TQKeyEvent *e) { e->accept(); return; } - else if (e->key() == Qt::Key_Down) { + else if (e->key() == TQt::Key_Down) { TQListViewItem *item = currentItem(); if ((item != 0) && (item->isSelected())) { - TQListViewItem *parent; + TQListViewItem *tqparent; TQListViewItem *above; - if (PhraseTreePrivate::findBelowPosition (item, &parent, &above)) { - moveItem(item, parent, above); + if (PhraseTreePrivate::findBelowPosition (item, &tqparent, &above)) { + moveItem(item, tqparent, above); setCurrentItem (item); item->setSelected(true); } @@ -312,14 +312,14 @@ void PhraseTree::keyPressEvent (TQKeyEvent *e) { e->accept(); return; } - else if (e->key() == Qt::Key_Left) { + else if (e->key() == TQt::Key_Left) { TQListViewItem *item = currentItem(); if ((item != 0) && (item->isSelected())) { - TQListViewItem *parent; + TQListViewItem *tqparent; TQListViewItem *above; - if (PhraseTreePrivate::findLeftPosition (item, &parent, &above)) { - moveItem(item, parent, above); + if (PhraseTreePrivate::findLeftPosition (item, &tqparent, &above)) { + moveItem(item, tqparent, above); setCurrentItem (item); item->setSelected(true); } @@ -327,14 +327,14 @@ void PhraseTree::keyPressEvent (TQKeyEvent *e) { e->accept(); return; } - else if (e->key() == Qt::Key_Right) { + else if (e->key() == TQt::Key_Right) { TQListViewItem *item = currentItem(); if ((item != 0) && (item->isSelected())) { - TQListViewItem *parent; + TQListViewItem *tqparent; TQListViewItem *above; - if (PhraseTreePrivate::findRightPosition (item, &parent, &above)) { - moveItem(item, parent, above); + if (PhraseTreePrivate::findRightPosition (item, &tqparent, &above)) { + moveItem(item, tqparent, above); setCurrentItem (item); item->setSelected(true); } @@ -346,57 +346,57 @@ void PhraseTree::keyPressEvent (TQKeyEvent *e) { KListView::keyPressEvent(e); } -PhraseTreeItem *PhraseTree::insertPhrase (TQListViewItem *parent, TQListViewItem *after, TQString phrase, TQString shortcut) { +PhraseTreeItem *PhraseTree::insertPhrase (TQListViewItem *tqparent, TQListViewItem *after, TQString phrase, TQString shortcut) { KShortcut cut = KShortcut(shortcut); if (isKeyPresent (cut, 0, false)) - cut = KShortcut(TQString::null); + cut = KShortcut(TQString()); - if (parent == 0) + if (tqparent == 0) return new PhraseTreeItem (this, after, phrase, cut, this->phrase); else - return new PhraseTreeItem (parent, after, phrase, cut, this->phrase); + return new PhraseTreeItem (tqparent, after, phrase, cut, this->phrase); } -PhraseTreeItem *PhraseTree::insertBook (TQListViewItem *parent, TQListViewItem *after, TQString name) { - if (parent == 0) +PhraseTreeItem *PhraseTree::insertBook (TQListViewItem *tqparent, TQListViewItem *after, TQString name) { + if (tqparent == 0) return new PhraseTreeItem (this, after, name, phrasebook_closed); else - return new PhraseTreeItem (parent, after, name, phrasebook_closed); + return new PhraseTreeItem (tqparent, after, name, phrasebook_closed); } -TQListViewItem *PhraseTree::addBook (TQListViewItem *parent, TQListViewItem *after, PhraseBook *book) { +TQListViewItem *PhraseTree::addBook (TQListViewItem *tqparent, 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) { - parent = insertBook(parent, last, ""); + tqparent = insertBook(tqparent, last, ""); last = 0; level++; } while (level > newLevel) { - last = parent; - if (parent != 0) - parent = parent->parent(); + last = tqparent; + if (tqparent != 0) + tqparent = tqparent->tqparent(); level--; } if ((*it).isPhrase()) { Phrase phrase = (*it).getPhrase(); - last = insertPhrase (parent, last, phrase.getPhrase(), phrase.getShortcut()); + last = insertPhrase (tqparent, last, phrase.getPhrase(), phrase.getShortcut()); } else { Phrase phrase = (*it).getPhrase(); - parent = insertBook(parent, last, phrase.getPhrase()); + tqparent = insertBook(tqparent, last, phrase.getPhrase()); last = 0; level++; } } while (level > 0) { - last = parent; - if (parent != 0) - parent = parent->parent(); + last = tqparent; + if (tqparent != 0) + tqparent = tqparent->tqparent(); level--; } return last; @@ -421,7 +421,7 @@ void PhraseTree::fillBook (PhraseBook *book, bool respectSelection) { } else { while ((i != 0) && (i->nextSibling() == 0)) { - i = i->parent(); + i = i->tqparent(); if (level > 0) level--; } @@ -470,7 +470,7 @@ void PhraseTree::_warning (const KKeySequence& cut, TQString sAction, TQString s i18n("The '%1' key combination has already been allocated " "to %2.\n" "Please choose a unique key combination."). - arg(cut.toString()).arg(sAction); + tqarg(cut.toString()).tqarg(sAction); KMessageBox::sorry( this, s, sTitle ); } @@ -485,7 +485,7 @@ bool PhraseTree::isStdAccelPresent (const KShortcut& cut, bool warnUser) { { if (warnUser) _warning (cut.seq(iSeq), - i18n("the standard \"%1\" action").arg(KStdAccel::label(id)), + i18n("the standard \"%1\" action").tqarg(KStdAccel::label(id)), i18n("Conflict with Standard Application Shortcut")); return true; } @@ -501,7 +501,7 @@ bool PhraseTree::isGlobalKeyPresent (const KShortcut& cut, bool warnUser) { if (iSeq > -1) { if (warnUser) _warning (cut.seq(iSeq), - i18n("the global \"%1\" action").arg(it.key()), + i18n("the global \"%1\" action").tqarg(it.key()), i18n("Conflict with Global Shortcuts")); return true; } diff --git a/kmouth/phrasebook/phrasetree.h b/kmouth/phrasebook/phrasetree.h index 45ae26c..26af68c 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 *parent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon); + PhraseTreeItem (TQListView *tqparent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon); /** Creates a phrase item at the top level */ - PhraseTreeItem (TQListViewItem *parent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon); + PhraseTreeItem (TQListViewItem *tqparent, TQListViewItem *after, TQString phrase, KShortcut shortcut, TQPixmap icon); /** Creates a phrase book item within a sub phrase book */ - PhraseTreeItem (TQListView *parent, TQListViewItem *after, TQString name, TQPixmap icon); + PhraseTreeItem (TQListView *tqparent, TQListViewItem *after, TQString name, TQPixmap icon); /** Creates a phrase book item at the top level */ - PhraseTreeItem (TQListViewItem *parent, TQListViewItem *after, TQString name, TQPixmap icon); + PhraseTreeItem (TQListViewItem *tqparent, TQListViewItem *after, TQString name, TQPixmap icon); public: bool isPhrase(); @@ -60,22 +60,23 @@ private: class PhraseTree : public KListView { friend class PhraseTreeItem; Q_OBJECT + TQ_OBJECT public: - PhraseTree (TQWidget *parent = 0, const char *name = 0); + PhraseTree (TQWidget *tqparent = 0, const char *name = 0); ~PhraseTree (); void keyPressEvent (TQKeyEvent *e); - PhraseTreeItem *insertPhrase (TQListViewItem *parent, TQListViewItem *after, TQString phrase, TQString shortcut); - PhraseTreeItem *insertBook (TQListViewItem *parent, TQListViewItem *after, TQString name); + PhraseTreeItem *insertPhrase (TQListViewItem *tqparent, TQListViewItem *after, TQString phrase, TQString shortcut); + PhraseTreeItem *insertBook (TQListViewItem *tqparent, TQListViewItem *after, TQString name); - TQListViewItem *addBook (TQListViewItem *parent, TQListViewItem *after, PhraseBook *book); + TQListViewItem *addBook (TQListViewItem *tqparent, TQListViewItem *after, PhraseBook *book); void fillBook (PhraseBook *book, bool respectSelection); TQDragObject *dragObject (); TQDragObject *dragObject (bool isDependent); - void moveItem (TQListViewItem *item, TQListViewItem *parent, TQListViewItem *above); + void moveItem (TQListViewItem *item, TQListViewItem *tqparent, TQListViewItem *above); bool hasSelectedItems(); void deleteSelectedItems(); diff --git a/kmouth/phraseedit.cpp b/kmouth/phraseedit.cpp index 000a1f5..4397bb6 100644 --- a/kmouth/phraseedit.cpp +++ b/kmouth/phraseedit.cpp @@ -17,36 +17,36 @@ #include "phraseedit.h" -PhraseEdit::PhraseEdit(const TQString &string, TQWidget *parent) - : KLineEdit (string, parent) { +PhraseEdit::PhraseEdit(const TQString &string, TQWidget *tqparent) + : KLineEdit (string, tqparent) { } PhraseEdit::~PhraseEdit() { } void PhraseEdit::keyPressEvent (TQKeyEvent *e) { - if ((e->state() & Qt::KeyButtonMask) == Qt::ControlButton) { - if (e->key() == Qt::Key_C) { + if ((e->state() & TQt::KeyButtonMask) == TQt::ControlButton) { + if (e->key() == TQt::Key_C) { if (!this->hasSelectedText()) { e->ignore(); return; } } - else if (e->key() == Qt::Key_Insert) { + else if (e->key() == TQt::Key_Insert) { if (!hasSelectedText()) { e->ignore(); return; } } - else if (e->key() == Qt::Key_X) { + else if (e->key() == TQt::Key_X) { if (!hasSelectedText()) { e->ignore(); return; } } } - else if ((e->state() & Qt::KeyButtonMask) == Qt::ShiftButton) { - if (e->key() == Qt::Key_Delete) { + else if ((e->state() & TQt::KeyButtonMask) == TQt::ShiftButton) { + if (e->key() == TQt::Key_Delete) { if (!hasSelectedText()) { e->ignore(); return; diff --git a/kmouth/phraseedit.h b/kmouth/phraseedit.h index 0ebd132..ccc5342 100644 --- a/kmouth/phraseedit.h +++ b/kmouth/phraseedit.h @@ -27,7 +27,7 @@ class PhraseEdit : public KLineEdit { public: - PhraseEdit(const TQString &string, TQWidget *parent); + PhraseEdit(const TQString &string, TQWidget *tqparent); virtual ~PhraseEdit(); void keyPressEvent (TQKeyEvent *e); diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp index 48148c3..6264f14 100644 --- a/kmouth/phraselist.cpp +++ b/kmouth/phraselist.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// include files for Qt +// include files for TQt #include <tqprinter.h> #include <tqpainter.h> #include <tqlayout.h> @@ -45,19 +45,19 @@ #include "phrasebook/phrasebook.h" #include "wordcompletion/wordcompletion.h" -PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,name) { +PhraseList::PhraseList(TQWidget *tqparent, const char *name) : TQWidget(tqparent,name) { isInSlot = false; setBackgroundMode(PaletteBase); - TQVBoxLayout *layout = new TQVBoxLayout (this); + TQVBoxLayout *tqlayout = new TQVBoxLayout (this); listBox = new KListBox (this); - listBox->setFocusPolicy(TQWidget::NoFocus); + listBox->setFocusPolicy(TQ_NoFocus); listBox->setSelectionMode (TQListBox::Extended); TQWhatsThis::add (listBox, i18n("This list contains the history of spoken sentences. You can select sentences and press the speak button for re-speaking.")); - layout->addWidget(listBox); + tqlayout->addWidget(listBox); TQHBoxLayout *rowLayout = new TQHBoxLayout (); - layout->addLayout(rowLayout); + tqlayout->addLayout(rowLayout); completion = new WordCompletion(); @@ -66,7 +66,7 @@ PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,nam rowLayout->addWidget(dictionaryCombo); lineEdit = new PhraseEdit ("", this); - lineEdit->setFocusPolicy(TQWidget::StrongFocus); + lineEdit->setFocusPolicy(TQ_StrongFocus); lineEdit->setFrame(true); lineEdit->setEchoMode(TQLineEdit::Normal); lineEdit->setCompletionObject (completion); @@ -77,7 +77,7 @@ PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,nam TQIconSet icon = KGlobal::iconLoader()->loadIconSet("speak", KIcon::Small); speakButton = new TQPushButton (icon, i18n("&Speak"), this); - speakButton->setFocusPolicy(TQWidget::NoFocus); + speakButton->setFocusPolicy(TQ_NoFocus); speakButton->setAutoDefault(false); TQWhatsThis::add (speakButton, i18n("Speaks the currently active sentence(s). If there is some text in the edit field it is spoken. Otherwise the selected sentences in the history (if any) are spoken.")); rowLayout->addWidget(speakButton); @@ -139,7 +139,7 @@ void PhraseList::enableMenuEntries() { else deselected = true; } - KMouthApp *theApp=(KMouthApp *) parentWidget(); + KMouthApp *theApp=(KMouthApp *) tqparentWidget(); theApp->enableMenuEntries (selected, deselected); } @@ -191,7 +191,7 @@ void PhraseList::readCompletionOptions(KConfig *config) { int mode = config->readNumEntry ("Mode", KGlobalSettings::completionMode()); lineEdit->setCompletionMode (static_cast<KGlobalSettings::Completion>(mode)); - TQString current = config->readEntry ("List", TQString::null); + TQString current = config->readEntry ("List", TQString()); TQStringList list = completion->wordLists(); TQStringList::ConstIterator it; int i = 0; @@ -271,7 +271,7 @@ void PhraseList::cutListSelection () { } void PhraseList::copyListSelection () { - TQApplication::clipboard()->setText (getListSelection().join ("\n")); + TQApplication::tqclipboard()->setText (getListSelection().join ("\n")); } void PhraseList::lineEntered (const TQString &phrase) { @@ -285,7 +285,7 @@ void PhraseList::lineEntered (const TQString &phrase) { void PhraseList::speakPhrase (const TQString &phrase) { TQApplication::setOverrideCursor (KCursor::WaitCursor, false); - KMouthApp *theApp=(KMouthApp *) parentWidget(); + KMouthApp *theApp=(KMouthApp *) tqparentWidget(); TQString language = completion->languageOfWordList (completion->currentWordList()); theApp->getTTSSystem()->speak(phrase, language); TQApplication::restoreOverrideCursor (); @@ -313,7 +313,7 @@ void PhraseList::contextMenuRequested (TQListBoxItem *, const TQPoint &pos) { else name = "phraselist_popup"; - KMouthApp *theApp=(KMouthApp *) parentWidget(); + KMouthApp *theApp=(KMouthApp *) tqparentWidget(); KXMLGUIFactory *factory = theApp->factory(); TQPopupMenu *popup = (TQPopupMenu *)factory->container(name,theApp); if (popup != 0) { @@ -357,7 +357,7 @@ void PhraseList::setEditLineText(const TQString &s) { } void PhraseList::keyPressEvent (TQKeyEvent *e) { - if (e->key() == Qt::Key_Up) { + if (e->key() == TQt::Key_Up) { bool selected = false; for (TQListBoxItem *item = listBox->firstItem(); item != 0; item = item->next()) { if (item->isSelected()) { @@ -394,7 +394,7 @@ void PhraseList::keyPressEvent (TQKeyEvent *e) { e->accept(); } - else if (e->key() == Qt::Key_Down) { + else if (e->key() == TQt::Key_Down) { bool selected = false; for (TQListBoxItem *item = listBox->firstItem(); item != 0; item = item->next()) { if (item->isSelected()) { @@ -419,12 +419,12 @@ void PhraseList::keyPressEvent (TQKeyEvent *e) { } e->accept(); } - else if ((e->state() & Qt::KeyButtonMask) == Qt::ControlButton) { - if (e->key() == Qt::Key_C) { + else if ((e->state() & TQt::KeyButtonMask) == TQt::ControlButton) { + if (e->key() == TQt::Key_C) { copy(); e->accept(); } - else if (e->key() == Qt::Key_X) { + else if (e->key() == TQt::Key_X) { cut(); e->accept(); } @@ -446,11 +446,11 @@ void PhraseList::save () { KURL url; if (book.save (this, i18n("Save As"), url, false) == -1) - KMessageBox::sorry(this,i18n("There was an error saving file\n%1").arg( url.url() )); + KMessageBox::sorry(this,i18n("There was an error saving file\n%1").tqarg( url.url() )); } void PhraseList::open () { - KURL url=KFileDialog::getOpenURL(TQString::null, + KURL url=KFileDialog::getOpenURL(TQString(), i18n("*|All Files\n*.phrasebook|Phrase Books (*.phrasebook)\n*.txt|Plain Text Files (*.txt)"), this, i18n("Open File as History")); if(!url.isEmpty()) @@ -464,7 +464,7 @@ void PhraseList::open (KURL url) { PhraseBook book; if (book.open (url)) { - // convert PhraseBookEntryList -> QStringList + // convert PhraseBookEntryList -> TQStringList TQStringList list = book.toStringList(); listBox->clear(); TQStringList::iterator it; @@ -472,7 +472,7 @@ void PhraseList::open (KURL url) { insertIntoPhraseList (*it, false); } else - KMessageBox::sorry(this,i18n("There was an error loading file\n%1").arg( url.url() )); + KMessageBox::sorry(this,i18n("There was an error loading file\n%1").tqarg( url.url() )); } #include "phraselist.moc" diff --git a/kmouth/phraselist.h b/kmouth/phraselist.h index 702e135..cad58ad 100644 --- a/kmouth/phraselist.h +++ b/kmouth/phraselist.h @@ -23,7 +23,7 @@ #include <klineedit.h> #include <kprinter.h> -// include files for Qt +// include files for TQt #include <tqwidget.h> #include <tqpushbutton.h> @@ -40,8 +40,9 @@ class WordCompletion; class PhraseList : public TQWidget { Q_OBJECT + TQ_OBJECT public: - PhraseList(TQWidget *parent=0, const char *name=0); + PhraseList(TQWidget *tqparent=0, const char *name=0); ~PhraseList(); /** contains the implementation for printing functionality */ diff --git a/kmouth/phraselistitem.cpp b/kmouth/phraselistitem.cpp index 721e893..6e902f3 100644 --- a/kmouth/phraselistitem.cpp +++ b/kmouth/phraselistitem.cpp @@ -46,7 +46,7 @@ void PhraseListItem::paint (TQPainter *p) { if (drawCursor()) { TQRect r (0, 0, listBox()->maxItemWidth(), height (listBox())); - listBox()->style().drawPrimitive (TQStyle::PE_FocusRect, p, r, - listBox()->colorGroup()); + listBox()->tqstyle().tqdrawPrimitive (TQStyle::PE_FocusRect, p, r, + listBox()->tqcolorGroup()); } } diff --git a/kmouth/preferencesui.ui b/kmouth/preferencesui.ui index a718b9d..dcc219d 100644 --- a/kmouth/preferencesui.ui +++ b/kmouth/preferencesui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>PreferencesUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>PreferencesUI</cstring> </property> @@ -33,7 +33,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -47,7 +47,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>speakLabel</cstring> </property> @@ -92,7 +92,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -106,7 +106,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>closeLabel</cstring> </property> @@ -158,5 +158,5 @@ </widget> </vbox> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmouth/speech.cpp b/kmouth/speech.cpp index 8fc8f19..300bfb1 100644 --- a/kmouth/speech.cpp +++ b/kmouth/speech.cpp @@ -51,7 +51,7 @@ TQString Speech::prepareCommand (TQString command, const TQString &text, TQValueStack<bool> stack; // saved isdoublequote values during parsing of braces bool issinglequote=false; // inside '...' ? bool isdoublequote=false; // inside "..." ? - int noreplace=0; // nested braces when within ${...} + int notqreplace=0; // nested braces when within ${...} TQString escText = KShellProcess::quote(text); // character sequences that change the state or need to be otherwise processed @@ -71,17 +71,17 @@ TQString Speech::prepareCommand (TQString command, const TQString &text, if ((command[i]=='(') || (command[i]=='{')) { // (...) or {...} // assert(isdoublequote == false) stack.push(isdoublequote); - if (noreplace > 0) + if (notqreplace > 0) // count nested braces when within ${...} - noreplace++; + notqreplace++; i++; } else if (command[i]=='$') { // $(...) or ${...} stack.push(isdoublequote); isdoublequote = false; - if ((noreplace > 0) || (command[i+1]=='{')) + if ((notqreplace > 0) || (command[i+1]=='{')) // count nested braces when within ${...} - noreplace++; + notqreplace++; i+=2; } else if ((command[i]==')') || (command[i]=='}')) { @@ -90,9 +90,9 @@ TQString Speech::prepareCommand (TQString command, const TQString &text, isdoublequote = stack.pop(); else qWarning("Parse error."); - if (noreplace > 0) + if (notqreplace > 0) // count nested braces when within ${...} - noreplace--; + notqreplace--; i++; } else if (command[i]=='\'') { @@ -107,7 +107,7 @@ TQString Speech::prepareCommand (TQString command, const TQString &text, i+=2; else if (command[i]=='`') { // Replace all `...` with safer $(...) - command.replace (i, 1, "$("); + command.tqreplace (i, 1, "$("); TQRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)"); for (int i2=re_backticks.search(command,i+2); i2!=-1; @@ -115,7 +115,7 @@ TQString Speech::prepareCommand (TQString command, const TQString &text, ) { if (command[i2] == '`') { - command.replace (i2, 1, ")"); + command.tqreplace (i2, 1, ")"); i2=command.length(); // leave loop } else { @@ -126,7 +126,7 @@ TQString Speech::prepareCommand (TQString command, const TQString &text, } // Leave i unchanged! We need to process "$(" } - else if (noreplace > 0) { // do not replace macros within ${...} + else if (notqreplace > 0) { // do not replace macros within ${...} if (issinglequote) i+=re_singlequote.matchedLength(); else if (isdoublequote) @@ -161,7 +161,7 @@ TQString Speech::prepareCommand (TQString command, const TQString &text, else if (issinglequote) v="'"+v+"'"; - command.replace (i, match.length(), v); + command.tqreplace (i, match.length(), v); i+=v.length(); } } @@ -225,10 +225,10 @@ void Speech::speak(TQString command, bool stdIn, const TQString &text, const TQS } void Speech::receivedStdout (KProcess *, char *buffer, int buflen) { - kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n"; + kdDebug() << TQString::tqfromLatin1(buffer, buflen) + "\n"; } void Speech::receivedStderr (KProcess *, char *buffer, int buflen) { - kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n"; + kdDebug() << TQString::tqfromLatin1(buffer, buflen) + "\n"; } void Speech::wroteStdin(KProcess *) { diff --git a/kmouth/speech.h b/kmouth/speech.h index 11331cf..f92bb98 100644 --- a/kmouth/speech.h +++ b/kmouth/speech.h @@ -29,6 +29,7 @@ class Speech : public TQObject { Q_OBJECT + TQ_OBJECT public: enum CharacterCodec { Local = 0, diff --git a/kmouth/texttospeechconfigurationui.ui b/kmouth/texttospeechconfigurationui.ui index de393ce..877b831 100644 --- a/kmouth/texttospeechconfigurationui.ui +++ b/kmouth/texttospeechconfigurationui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>texttospeechconfigurationui</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>texttospeechconfigurationui</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -39,7 +39,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>urlLabel</cstring> </property> @@ -87,7 +87,7 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout5</cstring> </property> @@ -101,7 +101,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>characterCodingLabel</cstring> </property> @@ -133,7 +133,7 @@ </widget> </vbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>stdInButton</cstring> </property> @@ -144,7 +144,7 @@ <string>This check box specifies whether the text is sent as standard input to the speech synthesizer.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>useKttsd</cstring> </property> @@ -157,10 +157,10 @@ </widget> </vbox> </widget> -<signals> +<Q_SIGNALS> <signal>configurationChanged()</signal> -</signals> -<layoutdefaults spacing="6" margin="11"/> +</Q_SIGNALS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kmouth/texttospeechconfigurationwidget.cpp b/kmouth/texttospeechconfigurationwidget.cpp index f7fe16a..11ad5d9 100644 --- a/kmouth/texttospeechconfigurationwidget.cpp +++ b/kmouth/texttospeechconfigurationwidget.cpp @@ -31,8 +31,8 @@ #include <tqcheckbox.h> #include <kurlrequester.h> -TextToSpeechConfigurationWidget::TextToSpeechConfigurationWidget (TQWidget *parent, const char *name) - : texttospeechconfigurationui (parent, name) +TextToSpeechConfigurationWidget::TextToSpeechConfigurationWidget (TQWidget *tqparent, const char *name) + : texttospeechconfigurationui (tqparent, name) { ttsSystem = new TextToSpeechSystem(); diff --git a/kmouth/texttospeechconfigurationwidget.h b/kmouth/texttospeechconfigurationwidget.h index a5ef3ba..0e567a3 100644 --- a/kmouth/texttospeechconfigurationwidget.h +++ b/kmouth/texttospeechconfigurationwidget.h @@ -30,7 +30,7 @@ class TextToSpeechConfigurationWidget : public texttospeechconfigurationui { friend class TextToSpeechConfigurationDialog; public: - TextToSpeechConfigurationWidget(TQWidget *parent, const char *name); + TextToSpeechConfigurationWidget(TQWidget *tqparent, const char *name); ~TextToSpeechConfigurationWidget(); TextToSpeechSystem *getTTSSystem() const; diff --git a/kmouth/texttospeechsystem.h b/kmouth/texttospeechsystem.h index f435585..db494e7 100644 --- a/kmouth/texttospeechsystem.h +++ b/kmouth/texttospeechsystem.h @@ -29,8 +29,9 @@ class KConfig; *@author Gunnar Schmi Dt */ -class TextToSpeechSystem : public QObject{ +class TextToSpeechSystem : public TQObject{ Q_OBJECT + TQ_OBJECT friend class TextToSpeechConfigurationWidget; public: TextToSpeechSystem(); diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui b/kmouth/wordcompletion/creationsourcedetailsui.ui index 1a1f61b..689ee25 100644 --- a/kmouth/wordcompletion/creationsourcedetailsui.ui +++ b/kmouth/wordcompletion/creationsourcedetailsui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>CreationSourceDetailsUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CreationSourceDetailsUI</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>spellCheckBox</cstring> </property> @@ -30,7 +30,7 @@ <string>If you select this check box the words are spell-checked before they are inserted into the new dictionary.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>encodingLabel</cstring> </property> @@ -52,7 +52,7 @@ <string>With this combo box you select the character encoding used to load text files. This combo box is not used for XML files or for dictionary files.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>urlLabel</cstring> </property> @@ -125,7 +125,7 @@ <string>With this input field you select the OpenOffice.org directory that will be used to spellcheck the words of the new dictionary.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>languageLabel</cstring> </property> @@ -166,13 +166,13 @@ <variables> <variable access="public">KLanguageButton *languageButton;</variable> </variables> -<slots> +<Q_SLOTS> <slot access="protected" specifier="non virtual">languageButton_activated( int index )</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kinputdialog.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui.h b/kmouth/wordcompletion/creationsourcedetailsui.ui.h index 16ecdc5..f3ed793 100644 --- a/kmouth/wordcompletion/creationsourcedetailsui.ui.h +++ b/kmouth/wordcompletion/creationsourcedetailsui.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -15,7 +15,7 @@ void CreationSourceDetailsUI::init() { TQWhatsThis::add (languageButton, i18n("With this combo box you decide which language should be associated with the new dictionary.")); loadLanguageList(languageButton); - languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString::null); + languageButton->insertLanguage("??", i18n("Other"), TQString::tqfromLatin1("l10n/"), TQString()); connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int))); } @@ -28,7 +28,7 @@ void CreationSourceDetailsUI::languageButton_activated (int) { languageButton->setCurrentItem(customLanguage); } else { - languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::fromLatin1("l10n/"), TQString::null); + languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString()); languageButton->setCurrentItem(customLanguage); } } diff --git a/kmouth/wordcompletion/creationsourceui.ui b/kmouth/wordcompletion/creationsourceui.ui index 13a7c06..603d15a 100644 --- a/kmouth/wordcompletion/creationsourceui.ui +++ b/kmouth/wordcompletion/creationsourceui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>CreationSourceUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CreationSourceUI</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>createButton</cstring> </property> @@ -30,7 +30,7 @@ <string>If you select this box a new dictionary is created by either loading a dictionary file or by counting the individual words in a text.</string> </property> </widget> - <widget class="QRadioButton" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>mergeButton</cstring> </property> @@ -41,7 +41,7 @@ <string>If you select this box a new dictionary is created by merging existing dictionaries.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="1"> + <widget class="TQRadioButton" row="2" column="1"> <property name="name"> <cstring>fileButton</cstring> </property> @@ -63,7 +63,7 @@ <string>If you select this box a new dictionary is created by loading a file. You may either select an XML file, a standard text file or a file containing a word completion dictionary. If you select a standard text file or an XML file the frequentness of the individual words is detected by simply counting the occurrences of each word.</string> </property> </widget> - <widget class="QRadioButton" row="1" column="1"> + <widget class="TQRadioButton" row="1" column="1"> <property name="name"> <cstring>kdeDocButton</cstring> </property> @@ -88,7 +88,7 @@ <string>If you select this box a new dictionary is created by parsing the KDE documentation. The frequentness of the individual words is detect by simply counting the occurrences of each word.</string> </property> </widget> - <widget class="QRadioButton" row="3" column="1"> + <widget class="TQRadioButton" row="3" column="1"> <property name="name"> <cstring>directoryButton</cstring> </property> @@ -120,14 +120,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QRadioButton" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>emptyButton</cstring> </property> @@ -161,19 +161,19 @@ </connection> </connections> <includes> - <include location="global" impldecl="in implementation">qbuttongroup.h</include> + <include location="global" impldecl="in implementation">tqbuttongroup.h</include> <include location="local" impldecl="in implementation">creationsourceui.ui.h</include> </includes> <forwards> <forward>class QButtonGroup</forward> </forwards> <variables> - <variable access="public">QButtonGroup *group2;</variable> - <variable access="public">QButtonGroup *group1;</variable> + <variable access="public">TQButtonGroup *group2;</variable> + <variable access="public">TQButtonGroup *group1;</variable> </variables> <functions> <function access="private" specifier="non virtual">init()</function> <function access="private" specifier="non virtual">destroy()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/kmouth/wordcompletion/creationsourceui.ui.h b/kmouth/wordcompletion/creationsourceui.ui.h index f9f3dad..6115008 100644 --- a/kmouth/wordcompletion/creationsourceui.ui.h +++ b/kmouth/wordcompletion/creationsourceui.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp index 13c770e..14b7980 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.cpp +++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp @@ -42,10 +42,10 @@ #include "kdedocsourceui.h" #include "wordlist.h" -DictionaryCreationWizard::DictionaryCreationWizard (TQWidget *parent, const char *name, +DictionaryCreationWizard::DictionaryCreationWizard (TQWidget *tqparent, const char *name, TQStringList dictionaryNames, TQStringList dictionaryFiles, TQStringList dictionaryLanguages) - : KWizard (parent, name) + : KWizard (tqparent, name) { buildCodecList (); @@ -161,10 +161,10 @@ TQString DictionaryCreationWizard::createDictionary() { if (creationSource->mergeButton->isChecked()) { map = WordList::mergeFiles (mergeWidget->mergeParameters(), pdlg); - dicFile = TQString::null; + dicFile = TQString(); } else if (creationSource->emptyButton->isChecked()) { - dicFile = TQString::null; + dicFile = TQString(); } else if (creationSource->fileButton->isChecked()) { TQString filename = fileWidget->url->url(); @@ -221,7 +221,7 @@ TQString DictionaryCreationWizard::createDictionary() { TQString dictionaryFile; do { dictnumber++; - filename = TQString("wordcompletion%1.dict").arg(dictnumber); + filename = TQString("wordcompletion%1.dict").tqarg(dictnumber); dictionaryFile = KApplication::kApplication()->dirs()->findResource("appdata", filename); } while (KStandardDirs::exists(dictionaryFile)); @@ -274,19 +274,19 @@ TQString DictionaryCreationWizard::language() { /***************************************************************************/ -MergeWidget::MergeWidget(KWizard *parent, const char *name, +MergeWidget::MergeWidget(KWizard *tqparent, const char *name, TQStringList dictionaryNames, TQStringList dictionaryFiles, TQStringList dictionaryLanguages) -: TQScrollView (parent, name) { +: TQScrollView (tqparent, name) { dictionaries.setAutoDelete (false); weights.setAutoDelete (false); TQWidget *contents = new TQWidget(viewport()); addChild(contents); - TQGridLayout *layout = new TQGridLayout (contents); + TQGridLayout *tqlayout = new TQGridLayout (contents); setResizePolicy (TQScrollView::AutoOneFit); - layout->setColStretch (0, 0); - layout->setColStretch (1, 1); + tqlayout->setColStretch (0, 0); + tqlayout->setColStretch (1, 1); int row = 0; TQStringList::Iterator nIt = dictionaryNames.begin(); @@ -295,8 +295,8 @@ MergeWidget::MergeWidget(KWizard *parent, const char *name, for (; nIt != dictionaryNames.end(); ++nIt, ++fIt, ++lIt) { TQCheckBox *checkbox = new TQCheckBox(*nIt, contents); KIntNumInput *numInput = new KIntNumInput(contents); - layout->addWidget (checkbox, row, 0); - layout->addWidget (numInput, row, 1); + tqlayout->addWidget (checkbox, row, 0); + tqlayout->addWidget (numInput, row, 1); checkbox->setChecked (true); numInput->setRange (1, 100, 10, true); @@ -335,13 +335,13 @@ TQString MergeWidget::language () { } } - return TQString::null; + return TQString(); } /***************************************************************************/ -CompletionWizardWidget::CompletionWizardWidget (KWizard *parent, const char *name) - : KDEDocSourceUI (parent, name) { +CompletionWizardWidget::CompletionWizardWidget (KWizard *tqparent, const char *name) + : KDEDocSourceUI (tqparent, name) { } CompletionWizardWidget::~CompletionWizardWidget() { diff --git a/kmouth/wordcompletion/dictionarycreationwizard.h b/kmouth/wordcompletion/dictionarycreationwizard.h index b947b7f..c2d1e2e 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.h +++ b/kmouth/wordcompletion/dictionarycreationwizard.h @@ -42,8 +42,9 @@ class MergeWidget; */ class DictionaryCreationWizard : public KWizard { Q_OBJECT + TQ_OBJECT public: - DictionaryCreationWizard (TQWidget *parent, const char *name, + DictionaryCreationWizard (TQWidget *tqparent, const char *name, TQStringList dictionaryNames, TQStringList dictionaryFiles, TQStringList dictionaryLanguages); @@ -76,8 +77,9 @@ private: */ class MergeWidget : public TQScrollView { Q_OBJECT + TQ_OBJECT public: - MergeWidget(KWizard *parent, const char *name, + MergeWidget(KWizard *tqparent, const char *name, TQStringList dictionaryNames, TQStringList dictionaryFiles, TQStringList dictionaryLanguages); @@ -99,9 +101,10 @@ private: */ class CompletionWizardWidget : public KDEDocSourceUI { Q_OBJECT + TQ_OBJECT friend class ConfigWizard; public: - CompletionWizardWidget(KWizard *parent, const char *name); + CompletionWizardWidget(KWizard *tqparent, const char *name); ~CompletionWizardWidget(); void ok (KConfig *config); diff --git a/kmouth/wordcompletion/kdedocsourceui.ui b/kmouth/wordcompletion/kdedocsourceui.ui index 21ce02a..8fc7b82 100644 --- a/kmouth/wordcompletion/kdedocsourceui.ui +++ b/kmouth/wordcompletion/kdedocsourceui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>KDEDocSourceUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KDEDocSourceUI</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>spellCheckBox</cstring> </property> @@ -49,7 +49,7 @@ <string>With this input field you select the OpenOffice.org directory that will be used to spellcheck the words of the new dictionary.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>languageLabel</cstring> </property> @@ -92,7 +92,7 @@ <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kmouth/wordcompletion/kdedocsourceui.ui.h b/kmouth/wordcompletion/kdedocsourceui.ui.h index 92a4c6b..0e3ade1 100644 --- a/kmouth/wordcompletion/kdedocsourceui.ui.h +++ b/kmouth/wordcompletion/kdedocsourceui.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kmouth/wordcompletion/klanguagebutton.cpp b/kmouth/wordcompletion/klanguagebutton.cpp index 5d4c062..e34881a 100644 --- a/kmouth/wordcompletion/klanguagebutton.cpp +++ b/kmouth/wordcompletion/klanguagebutton.cpp @@ -3,7 +3,7 @@ * * Copyright (c) 1999-2000 Hans Petter Bieker <bieker@kde.org> * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.trolltech.com/ * * This program is free software; you can redistribute it and/or modify @@ -60,12 +60,12 @@ static inline void checkInsertPos( TQPopupMenu *popup, const TQString & str, static inline TQPopupMenu * checkInsertIndex( TQPopupMenu *popup, const TQStringList *tags, const TQString &submenu ) { - int pos = tags->findIndex( submenu ); + int pos = tags->tqfindIndex( submenu ); TQPopupMenu *pi = 0; if ( pos != -1 ) { - TQMenuItem *p = popup->findItem( pos ); + TQMenuItem *p = popup->tqfindItem( pos ); pi = p ? p->popup() : 0; } if ( !pi ) @@ -80,8 +80,8 @@ KLanguageButton::~KLanguageButton() delete m_tags; } -KLanguageButton::KLanguageButton( TQWidget * parent, const char *name ) -: TQPushButton( parent, name ), +KLanguageButton::KLanguageButton( TQWidget * tqparent, const char *name ) +: TQPushButton( tqparent, name ), m_popup( 0 ), m_oldPopup( 0 ) { @@ -112,7 +112,7 @@ void KLanguageButton::insertSeparator( const TQString &submenu, int index ) { TQPopupMenu *pi = checkInsertIndex( m_popup, m_tags, submenu ); pi->insertSeparator( index ); - m_tags->append( TQString::null ); + m_tags->append( TQString() ); } void KLanguageButton::insertSubmenu( const TQString &text, const TQString &tag, @@ -132,12 +132,12 @@ void KLanguageButton::insertSubmenu( const TQString &text, const TQString &tag, void KLanguageButton::insertLanguage( const TQString& path, const TQString& name, const TQString& sub, const TQString &submenu, int index ) { - TQString output = name + TQString::fromLatin1( " (" ) + path + - TQString::fromLatin1( ")" ); + TQString output = name + TQString::tqfromLatin1( " (" ) + path + + TQString::tqfromLatin1( ")" ); #if 0 // Nooooo ! Country != language TQPixmap flag( locate( "locale", sub + path + - TQString::fromLatin1( "/flag.png" ) ) ); + TQString::tqfromLatin1( "/flag.png" ) ) ); #endif insertItem( output, path, submenu, index ); } @@ -174,7 +174,7 @@ void KLanguageButton::clear() connect( m_popup, TQT_SIGNAL( highlighted( int ) ), TQT_SIGNAL( highlighted( int ) ) ); - setText( TQString::null ); + setText( TQString() ); setIconSet( TQIconSet() ); } @@ -182,14 +182,14 @@ void KLanguageButton::clear() { if ( i < 0 || i >= count() ) return; - TQString output = name + TQString::fromLatin1( " (" ) + tag( i ) + - TQString::fromLatin1( ")" ); + TQString output = name + TQString::tqfromLatin1( " (" ) + tag( i ) + + TQString::tqfromLatin1( ")" ); changeItem( output, i ); }*/ bool KLanguageButton::containsTag( const TQString &str ) const { - return m_tags->contains( str ) > 0; + return m_tags->tqcontains( str ) > 0; } TQString KLanguageButton::currentTag() const @@ -202,7 +202,7 @@ TQString KLanguageButton::tag( int i ) const if ( i < 0 || i >= count() ) { kdDebug() << "KLanguageButton::tag(), unknown tag " << i << endl; - return TQString::null; + return TQString(); } return *m_tags->at( i ); } @@ -228,7 +228,7 @@ void KLanguageButton::setCurrentItem( int i ) void KLanguageButton::setCurrentItem( const TQString &code ) { - int i = m_tags->findIndex( code ); + int i = m_tags->tqfindIndex( code ); if ( code.isNull() ) i = 0; if ( i != -1 ) diff --git a/kmouth/wordcompletion/klanguagebutton.h b/kmouth/wordcompletion/klanguagebutton.h index 0ebe5c7..1c116b5 100644 --- a/kmouth/wordcompletion/klanguagebutton.h +++ b/kmouth/wordcompletion/klanguagebutton.h @@ -5,7 +5,7 @@ * Copyright (c) 1999-2000 Hans Petter Bieker <bieker@kde.org> * (c) 2001 Martijn Klingens <mklingens@yahoo.com> * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify @@ -34,33 +34,34 @@ * Essentially just a combo box with a 2-D dataset, but using a real * TQComboBox will produce ugly results. * - * Combined version of KTagCombo and KLanguageCombo but using a QPushButton + * Combined version of KTagCombo and KLanguageCombo but using a TQPushButton * instead. */ -class KLanguageButton : public QPushButton +class KLanguageButton : public TQPushButton { Q_OBJECT + TQ_OBJECT public: - KLanguageButton(TQWidget *parent=0, const char *name=0); + KLanguageButton(TQWidget *tqparent=0, const char *name=0); ~KLanguageButton(); void insertItem( const TQIconSet& icon, const TQString &text, - const TQString &tag, const TQString &submenu = TQString::null, + const TQString &tag, const TQString &submenu = TQString(), int index = -1 ); void insertItem( const TQString &text, const TQString &tag, - const TQString &submenu = TQString::null, int index = -1 ); - void insertSeparator( const TQString &submenu = TQString::null, + const TQString &submenu = TQString(), int index = -1 ); + void insertSeparator( const TQString &submenu = TQString(), int index = -1 ); void insertSubmenu( const TQString &text, const TQString &tag, - const TQString &submenu = TQString::null, int index = -1); + const TQString &submenu = TQString(), int index = -1); int count() const; void clear(); void insertLanguage( const TQString& path, const TQString& name, - const TQString& sub = TQString::null, - const TQString &submenu = TQString::null, int index = -1); + const TQString& sub = TQString(), + const TQString &submenu = TQString(), int index = -1); /* * Tag of the selected item diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp index a68007b..12059c1 100644 --- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp +++ b/kmouth/wordcompletion/klanguagebuttonhelper.cpp @@ -3,7 +3,7 @@ * * Copyright (c) 2003 Gunnar Schmi Dt <gunnar@schmi-dt.de> * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.trolltech.com/ * * This program is free software; you can redistribute it and/or modify @@ -31,30 +31,30 @@ TQString languageName (TQString languageCode) { TQString filename = KGlobal::dirs()->findResource("locale", - languageCode + TQString::fromLatin1("/entry.desktop")); + languageCode + TQString::tqfromLatin1("/entry.desktop")); KSimpleConfig entry(filename); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - return entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + return entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); } void loadLanguageList(KLanguageButton *combo) // This function was taken from kdebase/kcontrol/kdm/kdm-appear.cpp { TQStringList langlist = KGlobal::dirs()->findAllResources("locale", - TQString::fromLatin1("*/entry.desktop")); + TQString::tqfromLatin1("*/entry.desktop")); langlist.sort(); for ( TQStringList::ConstIterator it = langlist.begin(); it != langlist.end(); ++it ) { TQString fpath = (*it).left((*it).length() - 14); - int index = fpath.findRev('/'); + int index = fpath.tqfindRev('/'); TQString nid = fpath.mid(index + 1); KSimpleConfig entry(*it); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); - combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString::null); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); + combo->insertLanguage(nid, name, TQString::tqfromLatin1("l10n/"), TQString()); } if (KGlobal::locale()) diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.h b/kmouth/wordcompletion/klanguagebuttonhelper.h index 11edd09..0f4f232 100644 --- a/kmouth/wordcompletion/klanguagebuttonhelper.h +++ b/kmouth/wordcompletion/klanguagebuttonhelper.h @@ -3,7 +3,7 @@ * * Copyright (c) 2003 Gunnar Schmi Dt <gunnar@schmi-dt.de> * - * Requires the Qt widget libraries, available at no cost at + * Requires the TQt widget libraries, available at no cost at * http://www.troll.no/ * * This program is free software; you can redistribute it and/or modify diff --git a/kmouth/wordcompletion/wordcompletion.cpp b/kmouth/wordcompletion/wordcompletion.cpp index 268872a..a5d7a4e 100644 --- a/kmouth/wordcompletion/wordcompletion.cpp +++ b/kmouth/wordcompletion/wordcompletion.cpp @@ -38,7 +38,7 @@ WordCompletion::~WordCompletion() { delete d; } -typedef QPair<int,TQString> Match; +typedef TQPair<int,TQString> Match; typedef TQValueList<Match> MatchList; TQString WordCompletion::makeCompletion(const TQString &text) { @@ -46,7 +46,7 @@ TQString WordCompletion::makeCompletion(const TQString &text) { d->lastText = text; KCompletion::clear(); - int border = text.findRev(TQRegExp("\\W")); + int border = text.tqfindRev(TQRegExp("\\W")); TQString suffix = text.right (text.length() - border - 1).lower(); TQString prefix = text.left (border + 1); @@ -84,10 +84,10 @@ TQStringList WordCompletion::wordLists(const TQString &language) { } TQString WordCompletion::languageOfWordList(const TQString &wordlist) { - if (d->dictDetails.contains(wordlist)) + if (d->dictDetails.tqcontains(wordlist)) return d->dictDetails[wordlist].language; else - return TQString::null; + return TQString(); } TQString WordCompletion::currentWordList() { @@ -137,7 +137,7 @@ bool WordCompletion::setWordList(const TQString &wordlist) { d->wordsToSave = false; d->map.clear(); - bool result = d->dictDetails.contains (wordlist); + bool result = d->dictDetails.tqcontains (wordlist); if (result) d->current = wordlist; else @@ -177,13 +177,13 @@ void WordCompletion::addSentence (const TQString &sentence) { TQStringList::ConstIterator it; for (it = words.begin(); it != words.end(); ++it) { - if (!(*it).contains(TQRegExp("\\d|_"))) { + if (!(*it).tqcontains(TQRegExp("\\d|_"))) { TQString key = (*it).lower(); - if (d->map.contains(key)) + if (d->map.tqcontains(key)) d->map[key] += 1; else d->map[key] = 1; - if (d->addedWords.contains(key)) + if (d->addedWords.tqcontains(key)) d->addedWords[key] += 1; else d->addedWords[key] = 1; @@ -208,7 +208,7 @@ void WordCompletion::save () { stream << "WPDictFile\n"; TQMap<TQString,int>::ConstIterator it; for (it = d->map.begin(); it != d->map.end(); ++it) { - if (d->addedWords.contains(it.key())) { + if (d->addedWords.tqcontains(it.key())) { stream << it.key() << "\t" << d->addedWords[it.key()] << "\t1\n"; stream << it.key() << "\t" << it.data() - d->addedWords[it.key()] << "\t2\n"; } diff --git a/kmouth/wordcompletion/wordcompletion.h b/kmouth/wordcompletion/wordcompletion.h index 2bc5ceb..220196f 100644 --- a/kmouth/wordcompletion/wordcompletion.h +++ b/kmouth/wordcompletion/wordcompletion.h @@ -9,6 +9,7 @@ class WordCompletion : public KCompletion { friend class WordListWidget; Q_OBJECT + TQ_OBJECT public: WordCompletion(); virtual ~WordCompletion(); diff --git a/kmouth/wordcompletion/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui index 8036272..401a71b 100644 --- a/kmouth/wordcompletion/wordcompletionui.ui +++ b/kmouth/wordcompletion/wordcompletionui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>WordCompletionUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>WordCompletionUI</cstring> </property> @@ -16,9 +16,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>240</height> @@ -150,9 +150,9 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <vbox> <property name="name"> @@ -191,7 +191,7 @@ <string>This list contains all available dictionaries for the word completion. KMouth will display a combo box next to the edit field in the main window if this list contains more than one dictionary. You can use this combo box in order to select the dictionary that actually gets used for the word completion.</string> </property> </widget> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>selectedDictionaryDetails</cstring> </property> @@ -213,7 +213,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>languageLabel</cstring> </property> @@ -224,7 +224,7 @@ <string>With this combo box you select the language associated with the selected dictionary.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>dictionaryNameLabel</cstring> </property> @@ -273,13 +273,13 @@ <variables> <variable access="public">KLanguageButton *languageButton;</variable> </variables> -<slots> +<Q_SLOTS> <slot access="protected" specifier="non virtual">languageButton_activated( int index )</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kmouth/wordcompletion/wordcompletionui.ui.h b/kmouth/wordcompletion/wordcompletionui.ui.h index 9a428df..d74137e 100644 --- a/kmouth/wordcompletion/wordcompletionui.ui.h +++ b/kmouth/wordcompletion/wordcompletionui.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -15,7 +15,7 @@ void WordCompletionUI::init() { TQWhatsThis::add (languageButton, i18n("With this combo box you select the language associated with the selected dictionary.")); loadLanguageList(languageButton); - languageButton->insertLanguage("??", i18n("Other"), TQString::fromLatin1("l10n/"), TQString::null); + languageButton->insertLanguage("??", i18n("Other"), TQString::tqfromLatin1("l10n/"), TQString()); connect (languageButton, TQT_SIGNAL(activated(int)), this, TQT_SLOT(languageButton_activated(int))); } @@ -28,7 +28,7 @@ void WordCompletionUI::languageButton_activated (int) { languageButton->setCurrentItem(customLanguage); } else { - languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::fromLatin1("l10n/"), TQString::null); + languageButton->insertLanguage(customLanguage, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString()); languageButton->setCurrentItem(customLanguage); } } diff --git a/kmouth/wordcompletion/wordcompletionwidget.cpp b/kmouth/wordcompletion/wordcompletionwidget.cpp index b25df12..4c05557 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.cpp +++ b/kmouth/wordcompletion/wordcompletionwidget.cpp @@ -39,18 +39,18 @@ class DictionaryListItem : public KListViewItem { public: - DictionaryListItem (TQListView *parent, TQString filename, TQString name, TQString language, TQString languageCode) - : KListViewItem (parent, name) { + DictionaryListItem (TQListView *tqparent, TQString filename, TQString name, TQString language, TQString languageCode) + : KListViewItem (tqparent, name) { setFilename (filename); setLanguage (language, languageCode); }; - DictionaryListItem (TQListView *parent, TQString filename, TQString name, TQString languageCode) - : KListViewItem (parent, name) { + DictionaryListItem (TQListView *tqparent, TQString filename, TQString name, TQString languageCode) + : KListViewItem (tqparent, name) { setFilename (filename); setLanguage (languageCode); }; - DictionaryListItem (TQListView *parent, TQListViewItem *after, TQString filename, TQString name, TQString languageCode) - : KListViewItem (parent, after, name) { + DictionaryListItem (TQListView *tqparent, TQListViewItem *after, TQString filename, TQString name, TQString languageCode) + : KListViewItem (tqparent, after, name) { setFilename (filename); setLanguage (languageCode); }; @@ -71,11 +71,11 @@ public: void setLanguage (TQString languageCode) { TQString filename = KGlobal::dirs()->findResource("locale", - languageCode + TQString::fromLatin1("/entry.desktop")); + languageCode + TQString::tqfromLatin1("/entry.desktop")); KSimpleConfig entry(filename); - entry.setGroup(TQString::fromLatin1("KCM Locale")); - TQString name = entry.readEntry(TQString::fromLatin1("Name"), i18n("without name")); + entry.setGroup(TQString::tqfromLatin1("KCM Locale")); + TQString name = entry.readEntry(TQString::tqfromLatin1("Name"), i18n("without name")); setLanguage (name + " (" + languageCode + ")", languageCode); } @@ -91,7 +91,7 @@ private: /***************************************************************************/ -WordCompletionWidget::WordCompletionWidget(TQWidget *parent, const char *name) : WordCompletionUI (parent, name) { +WordCompletionWidget::WordCompletionWidget(TQWidget *tqparent, const char *name) : WordCompletionUI (tqparent, name) { dictionaryList->setSorting (-1); // no sorted list // Connect the signals from hte KCMKTTSDWidget to this class @@ -136,7 +136,7 @@ void WordCompletionWidget::load() { config->readEntry("Name"), languageTag); if (!languageButton->containsTag(languageTag)) - languageButton->insertLanguage(languageTag, i18n("without name"), TQString::fromLatin1("l10n/"), TQString::null); + languageButton->insertLanguage(languageTag, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString()); } // Clean up disc space @@ -159,7 +159,7 @@ void WordCompletionWidget::save() { while (it.current()) { DictionaryListItem *item = dynamic_cast<DictionaryListItem*>(it.current()); if (item != 0) { - config->setGroup(TQString("Dictionary %1").arg(number)); + config->setGroup(TQString("Dictionary %1").tqarg(number)); config->writeEntry ("Filename", item->filename()); config->writeEntry ("Name", item->text (0)); config->writeEntry ("Language", item->languageCode()); @@ -200,7 +200,7 @@ void WordCompletionWidget::addDictionary() { newDictionaryFiles += filename; TQString languageTag = wizard->language(); if (!languageButton->containsTag(languageTag)) { - languageButton->insertLanguage(languageTag, i18n("without name"), TQString::fromLatin1("l10n/"), TQString::null); + languageButton->insertLanguage(languageTag, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString()); } KListViewItem *item = new DictionaryListItem (dictionaryList, filename, wizard->name(), languageTag); @@ -246,13 +246,13 @@ void WordCompletionWidget::exportDictionary() { DictionaryListItem *item = dynamic_cast<DictionaryListItem*>(dictionaryList->selectedItem ()); if (item != 0) { - KURL url = KFileDialog::getSaveURL(TQString::null, TQString::null, this, i18n("Export Dictionary")); + KURL url = KFileDialog::getSaveURL(TQString(), TQString(), this, i18n("Export Dictionary")); if (url.isEmpty() || !url.isValid()) return; if (KIO::NetAccess::exists(url, false, this)) { - if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").arg(i18n("The file %1 already exists. " - "Do you want to overwrite it?").arg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) { + if (KMessageBox::warningContinueCancel(0,TQString("<qt>%1</qt>").tqarg(i18n("The file %1 already exists. " + "Do you want to overwrite it?").tqarg(url.url())),i18n("File Exists"),i18n("&Overwrite"))==KMessageBox::Cancel) { return; } } diff --git a/kmouth/wordcompletion/wordcompletionwidget.h b/kmouth/wordcompletion/wordcompletionwidget.h index fddf074..6118642 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.h +++ b/kmouth/wordcompletion/wordcompletionwidget.h @@ -30,8 +30,9 @@ class KLanguageButton; */ class WordCompletionWidget : public WordCompletionUI { Q_OBJECT + TQ_OBJECT public: - WordCompletionWidget(TQWidget *parent, const char *name); + WordCompletionWidget(TQWidget *tqparent, const char *name); ~WordCompletionWidget(); /** diff --git a/kmouth/wordcompletion/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp index f10feaf..15c4ea2 100644 --- a/kmouth/wordcompletion/wordlist.cpp +++ b/kmouth/wordcompletion/wordlist.cpp @@ -53,7 +53,7 @@ TQString XMLParser::errorString() { } bool XMLParser::startDocument() { - text = TQString::null; + text = TQString(); return true; } @@ -63,7 +63,7 @@ bool XMLParser::startElement (const TQString &, const TQString &, { if (!text.isNull() && !text.isEmpty()) { addWords (list, text); - text = TQString::null; + text = TQString(); } return true; } @@ -76,7 +76,7 @@ bool XMLParser::characters (const TQString &ch) { bool XMLParser::ignorableWhitespace (const TQString &) { if (!text.isNull() && !text.isEmpty()) { addWords (list, text); - text = TQString::null; + text = TQString(); } return true; } @@ -86,7 +86,7 @@ bool XMLParser::endElement (const TQString &, const TQString &, { if (!text.isNull() && !text.isEmpty()) { addWords (list, text); - text = TQString::null; + text = TQString(); } return true; } @@ -94,7 +94,7 @@ bool XMLParser::endElement (const TQString &, const TQString &, bool XMLParser::endDocument() { if (!text.isNull() && !text.isEmpty()) { addWords (list, text); - text = TQString::null; + text = TQString(); } return true; } @@ -139,9 +139,9 @@ void addWords (WordMap &map, TQString line) { TQStringList::ConstIterator it; for (it = words.begin(); it != words.end(); ++it) { - if (!(*it).contains(TQRegExp("\\d|_"))) { + if (!(*it).tqcontains(TQRegExp("\\d|_"))) { TQString key = (*it).lower(); - if (map.contains(key)) + if (map.tqcontains(key)) map[key] += 1; else map[key] = 1; @@ -152,7 +152,7 @@ void addWords (WordMap &map, TQString line) { void addWords (WordMap &map, WordMap add) { WordList::WordMap::ConstIterator it; for (it = add.begin(); it != add.end(); ++it) - if (map.contains(it.key())) + if (map.tqcontains(it.key())) map[it.key()] += it.data(); else map[it.key()] = it.data(); @@ -160,7 +160,7 @@ void addWords (WordMap &map, WordMap add) { void addWordsFromFile (WordMap &map, TQString filename, TQTextStream::Encoding encoding, TQTextCodec *codec) { TQFile xmlfile(filename); - TQXmlInputSource source (&xmlfile); + TQXmlInputSource source (TQT_TQIODEVICE(&xmlfile)); XMLParser parser; TQXmlSimpleReader reader; reader.setFeature ("http://trolltech.com/xml/features/report-start-end-entity", true); @@ -186,7 +186,7 @@ void addWordsFromFile (WordMap &map, TQString filename, TQTextStream::Encoding e bool ok; int weight = list[1].toInt(&ok); if (ok && (weight > 0)) { - if (map.contains(list[0])) + if (map.tqcontains(list[0])) map[list[0]] += weight; else map[list[0]] = weight; @@ -228,7 +228,7 @@ WordMap parseFiles (TQStringList files, TQTextStream::Encoding encoding, TQTextC if (steps != 0 && progress*100/steps > percent) { percent = progress*100/steps; pdlg->progressBar()->setProgress(percent); - qApp->processEvents (20); + tqApp->tqprocessEvents (20); } } return map; @@ -237,7 +237,7 @@ WordMap parseFiles (TQStringList files, TQTextStream::Encoding encoding, TQTextC WordMap mergeFiles (TQMap<TQString,int> files, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Merging dictionaries...")); pdlg->show(); - qApp->processEvents (20); + tqApp->tqprocessEvents (20); int progress = 0; int steps = files.count(); @@ -261,7 +261,7 @@ WordMap mergeFiles (TQMap<TQString,int> files, KProgressDialog *pdlg) { maxWeight = weight; for (iter = fileMap.begin(); iter != fileMap.end(); ++iter) - if (map.contains(iter.key())) + if (map.tqcontains(iter.key())) map[iter.key()] += iter.data() * factor; else map[iter.key()] = iter.data() * factor; @@ -269,7 +269,7 @@ WordMap mergeFiles (TQMap<TQString,int> files, KProgressDialog *pdlg) { if (steps != 0 && progress*100/steps > percent) { percent = progress*100/steps; pdlg->progressBar()->setProgress(percent); - qApp->processEvents (20); + tqApp->tqprocessEvents (20); } } @@ -290,7 +290,7 @@ WordMap mergeFiles (TQMap<TQString,int> files, KProgressDialog *pdlg) { WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Parsing the KDE documentation...")); pdlg->show(); - qApp->processEvents (20); + tqApp->tqprocessEvents (20); TQStringList files = KApplication::kApplication()->dirs()->findAllResources ("html", language + "/*.docbook", true, true); if ((files.count() == 0) && (language.length() == 5)) { @@ -304,7 +304,7 @@ WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) { WordMap parseFile (TQString filename, TQTextStream::Encoding encoding, TQTextCodec *codec, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Parsing file...")); pdlg->show(); - qApp->processEvents (20); + tqApp->tqprocessEvents (20); TQStringList files = filename; @@ -314,16 +314,16 @@ WordMap parseFile (TQString filename, TQTextStream::Encoding encoding, TQTextCod WordMap parseDir (TQString directory, TQTextStream::Encoding encoding, TQTextCodec *codec, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Parsing directory...")); pdlg->show(); - qApp->processEvents (20); + tqApp->tqprocessEvents (20); TQStringList directories; directories += directory; TQStringList files; for (TQStringList::Iterator it = directories.begin(); it != directories.end(); it = directories.remove(it)) { TQDir dir(*it); - const QFileInfoList *entries = dir.entryInfoList ("*", TQDir::Dirs | TQDir::Files | TQDir::NoSymLinks | TQDir::Readable); + const TQFileInfoList *entries = dir.entryInfoList ("*", TQDir::Dirs | TQDir::Files | TQDir::NoSymLinks | TQDir::Readable); if (entries != 0) { - QFileInfoListIterator iter (*entries); + TQFileInfoListIterator iter (*entries); while ((iter.current()) != 0) { TQString name = iter.current()->fileName(); if (name != "." && name != "..") { @@ -394,14 +394,14 @@ void loadAffFile(const TQString &filename, AffMap &prefixes, AffMap &suffixes) { if (s.startsWith("PFX")) { AffList list; - if (prefixes.contains (fields[1][0])) + if (prefixes.tqcontains (fields[1][0])) list = prefixes[fields[1][0]]; list << e; prefixes[fields[1][0]] = list; } else if (s.startsWith("SFX")) { AffList list; - if (suffixes.contains (fields[1][0])) + if (suffixes.tqcontains (fields[1][0])) list = suffixes[fields[1][0]]; list << e; suffixes[fields[1][0]] = list; @@ -432,7 +432,7 @@ inline bool checkCondition (const TQString &word, const TQStringList &condition) it != condition.end(); ++it, ++idx) { - if ((*it).contains(word[idx]) == ((*it)[0] == '^')) + if ((*it).tqcontains(word[idx]) == ((*it)[0] == '^')) return false; } return true; @@ -445,7 +445,7 @@ inline bool checkCondition (const TQString &word, const TQStringList &condition) */ inline void checkWord(const TQString &word, const TQString &modifiers, bool cross, const WordMap &map, WordMap &checkedMap, const AffMap &suffixes) { for (uint i = 0; i < modifiers.length(); i++) { - if (suffixes.contains(modifiers[i])) { + if (suffixes.tqcontains(modifiers[i])) { AffList sList = suffixes[modifiers[i]]; AffList::ConstIterator sIt; @@ -454,7 +454,7 @@ inline void checkWord(const TQString &word, const TQString &modifiers, bool cros && (checkCondition(word, (*sIt).condition))) { TQString sWord = word.left(word.length()-(*sIt).charsToRemove) + (*sIt).add; - if (map.contains(sWord)) + if (map.tqcontains(sWord)) checkedMap[sWord] = map[sWord]; } } @@ -467,19 +467,19 @@ inline void checkWord(const TQString &word, const TQString &modifiers, bool cros * @param modifiers discribes which pre- and suffixes are valid */ void checkWord (const TQString &word, const TQString &modifiers, const WordMap &map, WordMap &checkedMap, const AffMap &prefixes, const AffMap &suffixes) { - if (map.contains(word)) + if (map.tqcontains(word)) checkedMap[word] = map[word]; checkWord(word, modifiers, true, map, checkedMap, suffixes); for (uint i = 0; i < modifiers.length(); i++) { - if (prefixes.contains(modifiers[i])) { + if (prefixes.tqcontains(modifiers[i])) { AffList pList = prefixes[modifiers[i]]; AffList::ConstIterator pIt; for (pIt = pList.begin(); pIt != pList.end(); ++pIt) { TQString pWord = (*pIt).add + word; - if (map.contains(pWord)) + if (map.tqcontains(pWord)) checkedMap[pWord] = map[pWord]; checkWord(pWord, modifiers, false, map, checkedMap, suffixes); @@ -504,7 +504,7 @@ WordMap spellCheck (WordMap map, TQString dictionary, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Performing spell check...")); pdlg->progressBar()->setTotalSteps(100); pdlg->progressBar()->setProgress(0); - qApp->processEvents (20); + tqApp->tqprocessEvents (20); int progress = 0; int steps = 0; int percent = 0; @@ -520,14 +520,14 @@ WordMap spellCheck (WordMap map, TQString dictionary, KProgressDialog *pdlg) { while (!stream.atEnd()) { TQString s = stream.readLine(); - if (s.contains("/")) { - TQString word = s.left(s.find("/")).lower(); - TQString modifiers = s.right(s.length() - s.find("/")); + if (s.tqcontains("/")) { + TQString word = s.left(s.tqfind("/")).lower(); + TQString modifiers = s.right(s.length() - s.tqfind("/")); checkWord(word, modifiers, map, checkedMap, prefixes, suffixes); } else { - if (!s.isEmpty() && !s.isNull() && map.contains(s.lower())) + if (!s.isEmpty() && !s.isNull() && map.tqcontains(s.lower())) checkedMap[s.lower()] = map[s.lower()]; } @@ -535,7 +535,7 @@ WordMap spellCheck (WordMap map, TQString dictionary, KProgressDialog *pdlg) { if (steps != 0 && progress*100/steps > percent) { percent = progress*100/steps; pdlg->progressBar()->setProgress(percent); - qApp->processEvents (20); + tqApp->tqprocessEvents (20); } } } diff --git a/kmouth/wordcompletion/wordlist.h b/kmouth/wordcompletion/wordlist.h index 2ce004f..11dd6c1 100644 --- a/kmouth/wordcompletion/wordlist.h +++ b/kmouth/wordcompletion/wordlist.h @@ -46,7 +46,7 @@ bool saveWordList (WordMap map, TQString filename); /** * This class implements a parser for reading docbooks and generating word - * lists. It is intended to be used together with the Qt SAX2 framework. + * lists. It is intended to be used together with the TQt SAX2 framework. * @author Gunnar Schmi Dt */ diff --git a/ksayit/Doxyfile b/ksayit/Doxyfile index cb1408f..77566a0 100644 --- a/ksayit/Doxyfile +++ b/ksayit/Doxyfile @@ -16,7 +16,7 @@ ABBREVIATE_BRIEF = "The $name class" \ is \ provides \ specifies \ - contains \ + tqcontains \ represents \ a \ an \ @@ -102,7 +102,7 @@ FILE_PATTERNS = *.c \ *.tlh \ *.diff \ *.patch \ - *.moc \ + *.tqmoc \ *.xpm \ *.dox RECURSIVE = yes diff --git a/ksayit/Freeverb_plugin/Makefile.am b/ksayit/Freeverb_plugin/Makefile.am index 0db4104..d226444 100644 --- a/ksayit/Freeverb_plugin/Makefile.am +++ b/ksayit/Freeverb_plugin/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/ksayit/src $(all_includes) +INCLUDES = -I$(top_srcdir)/ksayit/src $(all_includes) -I$(kde_includes)/kde -I$(kde_includes)/arts METASOURCES = AUTO kde_servicetypes_DATA = ksayit_libFreeverb_service.desktop kde_services_DATA = ksayit_libFreeverb.desktop diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui index ab3808a..c1dffb0 100644 --- a/ksayit/Freeverb_plugin/freeverb_setup.ui +++ b/ksayit/Freeverb_plugin/freeverb_setup.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>Freeverb_Setup</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>Freeverb_Setup</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>360</width> <height>300</height> @@ -36,15 +36,15 @@ <property name="resizeMode"> <enum>Minimum</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame_room</cstring> </property> @@ -56,7 +56,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>260</height> @@ -72,18 +72,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel_room</cstring> </property> <property name="text"> <string><b>Room</b></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLCDNumber"> + <widget class="TQLCDNumber"> <property name="name"> <cstring>LCD_room</cstring> </property> @@ -121,7 +121,7 @@ <enum>Flat</enum> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>slider_room</cstring> </property> @@ -149,7 +149,7 @@ </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame_damp</cstring> </property> @@ -161,7 +161,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>260</height> @@ -177,18 +177,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel_damp</cstring> </property> <property name="text"> <string><b>Damp</b></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLCDNumber"> + <widget class="TQLCDNumber"> <property name="name"> <cstring>LCD_damp</cstring> </property> @@ -226,7 +226,7 @@ <enum>Flat</enum> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>slider_damp</cstring> </property> @@ -248,7 +248,7 @@ </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame_wet</cstring> </property> @@ -260,7 +260,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>260</height> @@ -276,18 +276,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel_wet</cstring> </property> <property name="text"> <string><b>Wet</b></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLCDNumber"> + <widget class="TQLCDNumber"> <property name="name"> <cstring>LCD_wet</cstring> </property> @@ -325,7 +325,7 @@ <enum>Flat</enum> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>slider_wet</cstring> </property> @@ -347,7 +347,7 @@ </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame_dry</cstring> </property> @@ -359,7 +359,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>260</height> @@ -375,18 +375,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel_dry</cstring> </property> <property name="text"> <string><b>Dry</b></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLCDNumber"> + <widget class="TQLCDNumber"> <property name="name"> <cstring>LCD_dry</cstring> </property> @@ -424,7 +424,7 @@ <enum>Flat</enum> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>slider_dry</cstring> </property> @@ -446,7 +446,7 @@ </widget> </vbox> </widget> - <widget class="QFrame"> + <widget class="TQFrame"> <property name="name"> <cstring>frame_width</cstring> </property> @@ -458,7 +458,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>260</height> @@ -474,18 +474,18 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel_width</cstring> </property> <property name="text"> <string><b>Width</b></string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLCDNumber"> + <widget class="TQLCDNumber"> <property name="name"> <cstring>LCD_width</cstring> </property> @@ -523,7 +523,7 @@ <enum>Flat</enum> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>slider_width</cstring> </property> @@ -569,9 +569,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -587,7 +587,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>180</width> <height>20</height> @@ -598,7 +598,7 @@ <property name="name"> <cstring>OK_Button</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>60</width> <height>0</height> @@ -653,15 +653,15 @@ <slot>slotOKwasClicked()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>sliderRoomChanged(int)</slot> <slot>sliderDampChanged(int)</slot> <slot>sliderWetChanged(int)</slot> <slot>sliderDryChanged(int)</slot> <slot>sliderWidthChanged(int)</slot> <slot>slotOKwasClicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kpushbutton.h</includehint> </includehints> diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp b/ksayit/Freeverb_plugin/freeverbsetupimpl.cpp index 4fd00be..f861a57 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 *parent, const char *name, bool modal, KConfig *config ) - : Freeverb_Setup(parent,name,modal), m_config(config) { +FreeverbSetupImpl::FreeverbSetupImpl(TQWidget *tqparent, const char *name, bool modal, KConfig *config ) + : Freeverb_Setup(tqparent,name,modal), m_config(config) { // initialize Widgets Init(); diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.h b/ksayit/Freeverb_plugin/freeverbsetupimpl.h index b243faf..b7c884f 100644 --- a/ksayit/Freeverb_plugin/freeverbsetupimpl.h +++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.h @@ -33,8 +33,9 @@ class FreeverbSetupImpl : public Freeverb_Setup { Q_OBJECT + TQ_OBJECT public: - FreeverbSetupImpl(TQWidget *parent=0, const char *name=0, bool modal=true, KConfig *config=0); + FreeverbSetupImpl(TQWidget *tqparent=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 bb91885..64febd1 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 *parent, const char* name) +FreeverbPluginFactory::FreeverbPluginFactory(TQObject *tqparent, const char* name) { p_instance = new KInstance("FreeverbPluginFactory"); } -TQObject* FreeverbPluginFactory::createObject(TQObject *parent, const char* name, +TQObject* FreeverbPluginFactory::createObject(TQObject *tqparent, const char* name, const char*, const TQStringList &) { kdDebug(100200) << "FreeverbPluginFactory::createObject()" << endl; - TQObject* obj = new FreeverbPlugin( parent, name ); + TQObject* obj = new FreeverbPlugin( tqparent, name ); emit objectCreated( obj ); return obj; } @@ -62,8 +62,8 @@ TQObject* FreeverbPluginFactory::createObject(TQObject *parent, const char* name // Plugin Constructor -FreeverbPlugin::FreeverbPlugin(TQObject *parent, const char* name) //, KApplication *Appl) - : FXPlugin(parent, name) //, m_Appl(Appl) +FreeverbPlugin::FreeverbPlugin(TQObject *tqparent, const char* name) //, KApplication *Appl) + : FXPlugin(tqparent, 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 e9731d4..aac4408 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.h +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.h @@ -27,15 +27,16 @@ class FreeverbPluginFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: // Consturctor - FreeverbPluginFactory(TQObject *parent=0, const char* name=0); + FreeverbPluginFactory(TQObject *tqparent=0, const char* name=0); // Destructor virtual ~FreeverbPluginFactory(){ delete p_instance; }; - TQObject* createObject(TQObject *parent=0, const char* name=0, - const char* className="TQObject", + TQObject* createObject(TQObject *tqparent=0, const char* name=0, + const char* className=TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args=TQStringList()); private: @@ -50,9 +51,10 @@ private: class FreeverbPlugin : public FXPlugin { Q_OBJECT + TQ_OBJECT public: // Constructor - FreeverbPlugin(TQObject *parent=0, const char* name=0); //, KApplication *Appl=0); + FreeverbPlugin(TQObject *tqparent=0, const char* name=0); //, KApplication *Appl=0); // Destructor ~FreeverbPlugin(); diff --git a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui index 8c624e4..29be316 100644 --- a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui +++ b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KTTSDlibSetup</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KTTSDlibSetup</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -49,9 +49,9 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> @@ -67,14 +67,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>kcm_Button</cstring> </property> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> @@ -114,8 +114,8 @@ <slot>slotLaunchControlcenter()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot access="protected">slotLaunchControlcenter()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp index f41670b..9680a88 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.cpp +++ b/ksayit/KTTSD_Lib/kttsdlib.cpp @@ -11,7 +11,7 @@ // // #include <time.h> // nanosleep -// Qt includes +// TQt includes #include <tqstring.h> #include <tqstringlist.h> @@ -27,8 +27,8 @@ #include "kttsdlibsetupimpl.h" -KTTSDLib::KTTSDLib(TQObject *parent, const char *name, KApplication *Appl) - : TQObject(parent, name), m_Appl(Appl) +KTTSDLib::KTTSDLib(TQObject *tqparent, const char *name, KApplication *Appl) + : TQObject(tqparent, name), m_Appl(Appl) { KGlobal::locale()->insertCatalogue("libKTTSD"); m_talker = new kttsdlibtalker2(static_cast<TQObject*>(this), "kttsdlibtalker"); @@ -81,7 +81,7 @@ int KTTSDLib::getActions() } -int KTTSDLib::getStatus() const +int KTTSDLib::gettqStatus() const { return TTS::AUDIOFILE; } diff --git a/ksayit/KTTSD_Lib/kttsdlib.h b/ksayit/KTTSD_Lib/kttsdlib.h index eb57912..929ef3a 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.h +++ b/ksayit/KTTSD_Lib/kttsdlib.h @@ -45,9 +45,10 @@ class kttsdlibtalker2; /** @author Robert Vogl */ -class KDE_EXPORT KTTSDLib : public QObject +class KDE_EXPORT KTTSDLib : public TQObject { -Q_OBJECT +Q_OBJECT +TQ_OBJECT signals: /** Emitted when the plugin has been finished speeking. */ @@ -70,7 +71,7 @@ public slots: void slotTextStarted(const uint job); public: - KTTSDLib(TQObject *parent=0, const char *name=0, KApplication *Appl=0); + KTTSDLib(TQObject *tqparent=0, const char *name=0, KApplication *Appl=0); ~KTTSDLib(); @@ -92,7 +93,7 @@ public: void sayText(); - int getStatus() const; + int gettqStatus() const; void stop(); diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp index 1cb8bc9..0ade8fe 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp +++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp @@ -12,7 +12,7 @@ #include <stdio.h> -// Qt includes +// TQt includes #include <tqpushbutton.h> // KDE includes @@ -23,8 +23,8 @@ // App specific includes #include "kttsdlibsetupimpl.h" -KTTSDlibSetupImpl::KTTSDlibSetupImpl(TQWidget *parent, const char *name) - : KTTSDlibSetup(parent, name) +KTTSDlibSetupImpl::KTTSDlibSetupImpl(TQWidget *tqparent, const char *name) + : KTTSDlibSetup(tqparent, name) { } @@ -47,7 +47,7 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter() fgets(cmdresult, 18, fp); pclose(fp); } - if ( !TQCString(cmdresult).contains("kcmkttsd") ){ + if ( !TQCString(cmdresult).tqcontains("kcmkttsd") ){ TQString error = i18n("Control Center Module for KTTSD not found."); KMessageBox::sorry(this, error, i18n("Problem")); return; diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h index cd36430..ed49df4 100644 --- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h +++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.h @@ -12,7 +12,7 @@ #ifndef KTTSDSETUPIMPL_H #define KTTSDSETUPIMPL_H -// Qt includes +// TQt includes // KDE includes #include <kprocess.h> @@ -26,8 +26,9 @@ class KTTSDlibSetupImpl : public KTTSDlibSetup { Q_OBJECT + TQ_OBJECT public: - KTTSDlibSetupImpl(TQWidget *parent = 0, const char *name = 0); + KTTSDlibSetupImpl(TQWidget *tqparent = 0, const char *name = 0); ~KTTSDlibSetupImpl(); diff --git a/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp b/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp index c88a96b..10fceb9 100644 --- a/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp +++ b/ksayit/KTTSD_Lib/kttsdlibtalker2.cpp @@ -12,7 +12,7 @@ #include <unistd.h> //sleep -// Qt includes +// TQt includes #include <tqstring.h> // KDE includes @@ -21,8 +21,8 @@ // App specific includes #include "kttsdlibtalker2.h" -kttsdlibtalker2::kttsdlibtalker2(TQObject *parent, const char *name) - : TQObject(parent, name), DCOPStub("kttsd", "KSpeech") +kttsdlibtalker2::kttsdlibtalker2(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), DCOPStub("kttsd", "KSpeech") { m_client = NULL; diff --git a/ksayit/KTTSD_Lib/kttsdlibtalker2.h b/ksayit/KTTSD_Lib/kttsdlibtalker2.h index 29b6371..6627a6e 100644 --- a/ksayit/KTTSD_Lib/kttsdlibtalker2.h +++ b/ksayit/KTTSD_Lib/kttsdlibtalker2.h @@ -12,7 +12,7 @@ #ifndef KTTSDLIBTALKER2_H #define KTTSDLIBTALKER2_H -// Qt includes +// TQt includes #include <tqobject.h> #include <tqcstring.h> @@ -29,6 +29,7 @@ class kttsdlibtalker2 : public TQObject, public KSpeech_stub, virtual public KSpeechSink { Q_OBJECT + TQ_OBJECT signals: void signalTextStarted(const uint); @@ -36,7 +37,7 @@ signals: void signalTextStopped(const uint); public: - kttsdlibtalker2(TQObject *parent = 0, const char *name = 0); + kttsdlibtalker2(TQObject *tqparent = 0, const char *name = 0); ~kttsdlibtalker2(); diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui index 14e5f09..ed6f9b1 100644 --- a/ksayit/src/DocTreeView.ui +++ b/ksayit/src/DocTreeView.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>DocTreeView</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>DocTreeView</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>100</width> <height>200</height> @@ -105,21 +105,21 @@ <connections> <connection> <sender>listView</sender> - <signal>clicked(QListViewItem*)</signal> + <signal>clicked(TQListViewItem*)</signal> <receiver>DocTreeView</receiver> - <slot>slotItemClicked(QListViewItem*)</slot> + <slot>slotItemClicked(TQListViewItem*)</slot> </connection> <connection> <sender>listView</sender> - <signal>rightButtonPressed(QListViewItem*,const QPoint&,int)</signal> + <signal>rightButtonPressed(TQListViewItem*,const TQPoint&,int)</signal> <receiver>DocTreeView</receiver> - <slot>slotRightButtonPressed(QListViewItem*,const QPoint&,int)</slot> + <slot>slotRightButtonPressed(TQListViewItem*,const TQPoint&,int)</slot> </connection> </connections> <includes> <include location="local" impldecl="in implementation">DocTreeView.ui.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>signalContentChanged(const QString &)</signal> <signal>signalAllNodesProcessed()</signal> <signal>signalSetText(const QString &)</signal> @@ -128,9 +128,9 @@ <signal>signalSetBookmarkFilename(const QString&)</signal> <signal>signalChangeBookmarkFilename(const QString &)</signal> <signal>signalDeleteBookmark(const QString&, const QString&)</signal> -</signals> -<slots> - <slot>slotItemClicked( QListViewItem * )</slot> +</Q_SIGNALS> +<Q_SLOTS> + <slot>slotItemClicked( TQListViewItem * )</slot> <slot access="protected">slotRenameItem()</slot> <slot access="protected">slotDeleteItem()</slot> <slot access="protected">slotNewBookInfo()</slot> @@ -149,9 +149,9 @@ <slot access="protected">slotNewSection_3()</slot> <slot access="protected">slotNewSection_4()</slot> <slot access="protected">slotNewSection_5()</slot> - <slot>slotRightButtonPressed( QListViewItem * i, const QPoint &, int )</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot>slotRightButtonPressed( TQListViewItem * i, const TQPoint &, int )</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/ksayit/src/DocTreeView.ui.h b/ksayit/src/DocTreeView.ui.h index 9807a7c..4d1de7b 100644 --- a/ksayit/src/DocTreeView.ui.h +++ b/ksayit/src/DocTreeView.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you want to add, delete, or rename functions or slots, use -** Qt Designer to update this file, preserving your code. +** TQt Designer to update this file, preserving your code. ** ** You should not define a constructor or destructor in this file. ** Instead, write your code in functions called init() and destroy(). diff --git a/ksayit/src/KSayItView.ui b/ksayit/src/KSayItView.ui index 4ffa9b9..adb821b 100644 --- a/ksayit/src/KSayItView.ui +++ b/ksayit/src/KSayItView.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KSayItView</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KSayItView</cstring> </property> @@ -23,7 +23,7 @@ <property name="name"> <cstring>TextEdit</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>200</height> @@ -58,11 +58,11 @@ <tabstops> <tabstop>TextEdit</tabstop> </tabstops> -<slots> +<Q_SLOTS> <slot>slotCopyAvailable(bool)</slot> <slot>slotTextChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>ktextedit.h</includehint> </includehints> diff --git a/ksayit/src/Types.h b/ksayit/src/Types.h index 506e67f..005f108 100644 --- a/ksayit/src/Types.h +++ b/ksayit/src/Types.h @@ -54,9 +54,9 @@ This abstract class is the interface to access the items of the TreeView. class ListViewInterface : public KListViewItem { public: - ListViewInterface(ListViewInterface *parent=0, TQString label=TQString::null); - ListViewInterface(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null); - ListViewInterface(KListView *lv=0, TQString label=TQString::null); + ListViewInterface(ListViewInterface *tqparent=0, TQString label=TQString()); + ListViewInterface(ListViewInterface *tqparent=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 26e8831..75f06e7 100644 --- a/ksayit/src/contextmenuhandler.cpp +++ b/ksayit/src/contextmenuhandler.cpp @@ -10,7 +10,7 @@ // // -// Qt includes +// TQt includes #include <tqfile.h> #include <tqvariant.h> @@ -31,12 +31,12 @@ ContextActionHandler::ContextActionHandler(ContextMenuHandler *menuhandler) : TQXmlDefaultHandler(), m_menuhandler(menuhandler) { - m_subName = TQString::null; - m_actionName = TQString::null; - m_qty = TQString::null; + m_subName = TQString(); + m_actionName = TQString(); + m_qty = TQString(); m_popup = menuhandler->m_popupmenu; m_hit = false; - m_searchID = TQString::null; + m_searchID = TQString(); } ContextActionHandler::~ContextActionHandler() @@ -117,8 +117,8 @@ bool ContextActionHandler::characters( const TQString &ch ) /** * MenuHandler */ -ContextMenuHandler::ContextMenuHandler(TQObject *parent, const char *name) - : TQObject(parent, name), m_DocTreeView(parent) +ContextMenuHandler::ContextMenuHandler(TQObject *tqparent, const char *name) + : TQObject(tqparent, name), m_DocTreeView(tqparent) { m_popupmenu = NULL; m_item = NULL; @@ -293,7 +293,7 @@ bool ContextMenuHandler::parseXmlFile(const TQString &xmlID) ContextActionHandler handler(this); handler.setSearchID(xmlID); parser.setContentHandler( &handler ); - return parser.parse( &xmlFile ); + return parser.parse( TQT_TQIODEVICE(&xmlFile) ); } @@ -307,7 +307,7 @@ KAction* ContextMenuHandler::ActionFactory( const TQString &actionName, const TQ // check if qty is within allowed limits ListViewInterface *i = static_cast<ListViewInterface*>(m_item->firstChild()); int count = 0; - TQString name = TQString::null; + TQString name = TQString(); while (i){ name = ( i->getValue(KSayItGlobal::XMLCONTEXTNAME) ).toString(); if ( name.lower() == actionName.lower() ){ @@ -378,9 +378,9 @@ KAction* ContextMenuHandler::ActionFactory( const TQString &actionName, const TQ } -KPopupMenu* ContextMenuHandler::SubMenuFactory(KPopupMenu *parent) +KPopupMenu* ContextMenuHandler::SubMenuFactory(KPopupMenu *tqparent) { - return new KPopupMenu(parent); + return new KPopupMenu(tqparent); } diff --git a/ksayit/src/contextmenuhandler.h b/ksayit/src/contextmenuhandler.h index 148bb04..88d7c0e 100644 --- a/ksayit/src/contextmenuhandler.h +++ b/ksayit/src/contextmenuhandler.h @@ -12,7 +12,7 @@ #ifndef CONTEXTMENUHANDLER_H #define CONTEXTMENUHANDLER_H -// Qt includes +// TQt includes #include <tqobject.h> #include <tqstring.h> #include <tqxml.h> @@ -64,11 +64,12 @@ private: /** @author Robert Vogl */ -class ContextMenuHandler : public QObject +class ContextMenuHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - ContextMenuHandler(TQObject *parent = 0, const char *name = 0); + ContextMenuHandler(TQObject *tqparent = 0, const char *name = 0); ~ContextMenuHandler(); @@ -79,10 +80,10 @@ public: KPopupMenu* getPopupMenu(ListViewInterface *item); /** - * \returns A pointer to the Submenu as a child of the parent - * \p parent. + * \returns A pointer to the Submenu as a child of the tqparent + * \p tqparent. */ - KPopupMenu* SubMenuFactory(KPopupMenu *parent); + KPopupMenu* SubMenuFactory(KPopupMenu *tqparent); /** * Creates an action sufficiant to the given name. diff --git a/ksayit/src/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp index 9a3af1b..5f0fa00 100644 --- a/ksayit/src/docbookclasses.cpp +++ b/ksayit/src/docbookclasses.cpp @@ -9,7 +9,7 @@ // Copyright: See COPYING file that comes with this distribution // // -// Qt includes +// TQt includes #include <tqwidget.h> #include <tqtextstream.h> #include <tqpixmap.h> @@ -31,12 +31,12 @@ ////////////////////////////////////// // Interface ////////////////////////////////////// -ListViewInterface::ListViewInterface(ListViewInterface *parent, TQString label) - : KListViewItem( parent, label ) +ListViewInterface::ListViewInterface(ListViewInterface *tqparent, TQString label) + : KListViewItem( tqparent, label ) { } -ListViewInterface::ListViewInterface(ListViewInterface *parent, ListViewInterface *after, TQString label) : KListViewItem( parent, after, label ) +ListViewInterface::ListViewInterface(ListViewInterface *tqparent, ListViewInterface *after, TQString label) : KListViewItem( tqparent, after, label ) { } @@ -63,12 +63,12 @@ RobDocument::RobDocument(KListView *lv, TQString label) m_valueList.append( TQString("RobDocument") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)0 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData m_valueList.append("<H1><center>" + i18n("unnamed") + "</center></H1>"); // RTFHeader - m_valueList.append(TQString::null); // RTFData + m_valueList.append(TQString()); // RTFData m_valueList.append(i18n("unnamed") + "\n"); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -101,7 +101,7 @@ bool RobDocument::setValue( unsigned int index, TQVariant data ) TQVariant RobDocument::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -116,8 +116,8 @@ TQVariant RobDocument::getValue( unsigned int index ) const /** * Overview */ -Overview::Overview(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Overview::Overview(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small); this->setPixmap(0, pixmap); @@ -128,12 +128,12 @@ Overview::Overview(ListViewInterface *parent, ListViewInterface *after, TQString m_valueList.append( TQString("BookInfo") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)0 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData m_valueList.append("<H1>" + i18n("Overview") + "</H1>"); // RTFHeader - m_valueList.append(TQString::null); // RTFData + m_valueList.append(TQString()); // RTFData m_valueList.append(i18n("Overview") + "\n"); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -160,7 +160,7 @@ bool Overview::setValue( unsigned int index, TQVariant data ) TQVariant Overview::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -171,8 +171,8 @@ TQVariant Overview::getValue( unsigned int index ) const /** * Date */ -Date::Date(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Date::Date(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small); this->setPixmap(0, pixmap); @@ -183,12 +183,12 @@ Date::Date(ListViewInterface *parent, ListViewInterface *after, TQString label) m_valueList.append( TQString("Date") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)1 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData m_valueList.append("<B>" + i18n("Date") +": </B>"); // RTFHeader - m_valueList.append(TQString::null); // RTFData + m_valueList.append(TQString()); // RTFData m_valueList.append(i18n("Date") + ": "); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -227,7 +227,7 @@ bool Date::setValue( unsigned int index, TQVariant data ) TQVariant Date::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -238,8 +238,8 @@ TQVariant Date::getValue( unsigned int index ) const /** * ReleaseInfo */ -ReleaseInfo::ReleaseInfo(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +ReleaseInfo::ReleaseInfo(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small); this->setPixmap(0, pixmap); @@ -250,12 +250,12 @@ ReleaseInfo::ReleaseInfo(ListViewInterface *parent, ListViewInterface *after, TQ m_valueList.append( TQString("ReleaseInfo") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)1 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData m_valueList.append("<B>" + i18n("Release") + ": </B>"); // RTFHeader - m_valueList.append(TQString::null); // RTFData + m_valueList.append(TQString()); // RTFData m_valueList.append(i18n("Release") + ": "); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -294,7 +294,7 @@ bool ReleaseInfo::setValue( unsigned int index, TQVariant data ) TQVariant ReleaseInfo::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -305,8 +305,8 @@ TQVariant ReleaseInfo::getValue( unsigned int index ) const /** * Authorgroup */ -AuthorGroup::AuthorGroup(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +AuthorGroup::AuthorGroup(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("kdmconfig", KIcon::Small); this->setPixmap(0, pixmap); @@ -317,12 +317,12 @@ AuthorGroup::AuthorGroup(ListViewInterface *parent, ListViewInterface *after, TQ m_valueList.append( TQString("AuthorGroup") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)0 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData m_valueList.append("<H2>" + i18n("Author(s)")+ "</H2>"); // RTFHeader - m_valueList.append(TQString::null); // RTFData + m_valueList.append(TQString()); // RTFData m_valueList.append(i18n("Author(s)") + "\n"); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -349,7 +349,7 @@ bool AuthorGroup::setValue( unsigned int index, TQVariant data ) TQVariant AuthorGroup::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -361,8 +361,8 @@ TQVariant AuthorGroup::getValue( unsigned int index ) const /** * Author */ -Author::Author(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Author::Author(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("personal", KIcon::Small); this->setPixmap(0, pixmap); @@ -372,12 +372,12 @@ Author::Author(ListViewInterface *parent, ListViewInterface *after, TQString lab m_valueList.append( TQString("Author") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)1 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData m_valueList.append("<B>" + i18n("Author") + ": </B>"); // RTFHeader - m_valueList.append(TQString::null); // RTFData + m_valueList.append(TQString()); // RTFData m_valueList.append(i18n("Author") + ": "); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -389,9 +389,9 @@ Author::~Author() // { // // canonify string // TQString m_data = data; -// m_data.replace( TQRegExp("\n"), "" ); // remove Newlines -// m_data.replace( TQRegExp(" {2,}"), " " ); // remove multiple spaces -// m_data.replace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs +// m_data.tqreplace( TQRegExp("\n"), "" ); // remove Newlines +// m_data.tqreplace( TQRegExp(" {2,}"), " " ); // remove multiple spaces +// m_data.tqreplace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs // // split string "firstname surname" // TQString firstname = m_data.section(' ', 0, 0); // TQString surname = m_data.section(' ', 1, 1); @@ -434,7 +434,7 @@ bool Author::setValue( unsigned int index, TQVariant data ) TQVariant Author::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -445,8 +445,8 @@ TQVariant Author::getValue( unsigned int index ) const /** * KeywordSet */ -KeywordSet::KeywordSet(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +KeywordSet::KeywordSet(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("txt", KIcon::Small); this->setPixmap(0, pixmap); @@ -457,12 +457,12 @@ KeywordSet::KeywordSet(ListViewInterface *parent, ListViewInterface *after, TQSt m_valueList.append( TQString("KeywordSet") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)0 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData m_valueList.append("<H2>" + i18n("Keywords") + "</H2>"); // RTFHeader - m_valueList.append(TQString::null); // RTFData + m_valueList.append(TQString()); // RTFData m_valueList.append(i18n("Keywords") + "\n"); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -489,7 +489,7 @@ bool KeywordSet::setValue( unsigned int index, TQVariant data ) TQVariant KeywordSet::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -500,20 +500,20 @@ TQVariant KeywordSet::getValue( unsigned int index ) const /** * Keyword */ -Keyword::Keyword(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Keyword::Keyword(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { // new Concept (begin) m_valueList.clear(); m_valueList.append( TQString("Keyword") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (bool)1 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData - m_valueList.append(TQString::null); // RTFHeader - m_valueList.append(TQString::null); // RTFData - m_valueList.append(TQString::null); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData + m_valueList.append(TQString()); // RTFHeader + m_valueList.append(TQString()); // RTFData + m_valueList.append(TQString()); // SpeakerHeader + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -553,7 +553,7 @@ bool Keyword::setValue( unsigned int index, TQVariant data ) TQVariant Keyword::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -566,8 +566,8 @@ TQVariant Keyword::getValue( unsigned int index ) const /** * Abstract */ -Abstract::Abstract(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Abstract::Abstract(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small); this->setPixmap(0, pixmap); @@ -578,12 +578,12 @@ Abstract::Abstract(ListViewInterface *parent, ListViewInterface *after, TQString m_valueList.append( TQString("Abstract") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)0 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData m_valueList.append("<H2>" + i18n("Abstract") + "</H2>"); // RTFHeader - m_valueList.append(TQString::null); // RTFData + m_valueList.append(TQString()); // RTFData m_valueList.append(i18n("Abstract") + "\n"); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -610,7 +610,7 @@ bool Abstract::setValue( unsigned int index, TQVariant data ) TQVariant Abstract::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -622,8 +622,8 @@ TQVariant Abstract::getValue( unsigned int index ) const /** * Para */ -Para::Para(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Para::Para(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -633,12 +633,12 @@ Para::Para(ListViewInterface *parent, ListViewInterface *after, TQString label) m_valueList.append( TQString("Para") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)-1 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData - m_valueList.append(TQString::null); // RTFHeader - m_valueList.append(TQString::null); // RTFData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData + m_valueList.append(TQString()); // RTFHeader + m_valueList.append(TQString()); // RTFData m_valueList.append(i18n("Paragraph") + "\n"); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -652,7 +652,7 @@ bool Para::setValue( unsigned int index, TQVariant data ) return false; TQValueList<TQVariant>::Iterator it = m_valueList.at(index); - TQString sData = TQString::null; + TQString sData = TQString(); ParaSaxParser *p = ParaSaxParser::Instance(); switch (index){ case KSayItGlobal::ISEDITABLE: @@ -684,7 +684,7 @@ bool Para::setValue( unsigned int index, TQVariant data ) TQVariant Para::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -696,8 +696,8 @@ TQVariant Para::getValue( unsigned int index ) const /** * Chapter */ -Chapter::Chapter(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Chapter::Chapter(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -707,12 +707,12 @@ Chapter::Chapter(ListViewInterface *parent, ListViewInterface *after, TQString l m_valueList.append( TQString("Chapter") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)0 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData - m_valueList.append(TQString::null); // RTFHeader - m_valueList.append(TQString::null); // RTFData - m_valueList.append(TQString::null); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData + m_valueList.append(TQString()); // RTFHeader + m_valueList.append(TQString()); // RTFData + m_valueList.append(TQString()); // SpeakerHeader + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -745,7 +745,7 @@ bool Chapter::setValue( unsigned int index, TQVariant data ) TQVariant Chapter::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -757,8 +757,8 @@ TQVariant Chapter::getValue( unsigned int index ) const /** * Sect1 */ -Sect1::Sect1(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Sect1::Sect1(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -768,12 +768,12 @@ Sect1::Sect1(ListViewInterface *parent, ListViewInterface *after, TQString label m_valueList.append( TQString("Sect1") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)0 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData - m_valueList.append(TQString::null); // RTFHeader - m_valueList.append(TQString::null); // RTFData - m_valueList.append(TQString::null); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData + m_valueList.append(TQString()); // RTFHeader + m_valueList.append(TQString()); // RTFData + m_valueList.append(TQString()); // SpeakerHeader + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -806,7 +806,7 @@ bool Sect1::setValue( unsigned int index, TQVariant data ) TQVariant Sect1::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -817,8 +817,8 @@ TQVariant Sect1::getValue( unsigned int index ) const /** * Sect2 */ -Sect2::Sect2(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Sect2::Sect2(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -828,12 +828,12 @@ Sect2::Sect2(ListViewInterface *parent, ListViewInterface *after, TQString label m_valueList.append( TQString("Sect2") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)0 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData - m_valueList.append(TQString::null); // RTFHeader - m_valueList.append(TQString::null); // RTFData - m_valueList.append(TQString::null); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData + m_valueList.append(TQString()); // RTFHeader + m_valueList.append(TQString()); // RTFData + m_valueList.append(TQString()); // SpeakerHeader + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -866,7 +866,7 @@ bool Sect2::setValue( unsigned int index, TQVariant data ) TQVariant Sect2::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -877,8 +877,8 @@ TQVariant Sect2::getValue( unsigned int index ) const /** * Sect3 */ -Sect3::Sect3(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Sect3::Sect3(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -888,12 +888,12 @@ Sect3::Sect3(ListViewInterface *parent, ListViewInterface *after, TQString label m_valueList.append( TQString("Sect3") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)0 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData - m_valueList.append(TQString::null); // RTFHeader - m_valueList.append(TQString::null); // RTFData - m_valueList.append(TQString::null); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData + m_valueList.append(TQString()); // RTFHeader + m_valueList.append(TQString()); // RTFData + m_valueList.append(TQString()); // SpeakerHeader + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -926,7 +926,7 @@ bool Sect3::setValue( unsigned int index, TQVariant data ) TQVariant Sect3::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -937,8 +937,8 @@ TQVariant Sect3::getValue( unsigned int index ) const /** * Sect4 */ -Sect4::Sect4(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Sect4::Sect4(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -948,12 +948,12 @@ Sect4::Sect4(ListViewInterface *parent, ListViewInterface *after, TQString label m_valueList.append( TQString("Sect4") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)0 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData - m_valueList.append(TQString::null); // RTFHeader - m_valueList.append(TQString::null); // RTFData - m_valueList.append(TQString::null); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData + m_valueList.append(TQString()); // RTFHeader + m_valueList.append(TQString()); // RTFData + m_valueList.append(TQString()); // SpeakerHeader + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -986,7 +986,7 @@ bool Sect4::setValue( unsigned int index, TQVariant data ) TQVariant Sect4::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; @@ -997,8 +997,8 @@ TQVariant Sect4::getValue( unsigned int index ) const /** * Sect5 */ -Sect5::Sect5(ListViewInterface *parent, ListViewInterface *after, TQString label) - : ListViewInterface(parent, after, label) +Sect5::Sect5(ListViewInterface *tqparent, ListViewInterface *after, TQString label) + : ListViewInterface(tqparent, after, label) { TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small); this->setPixmap(0, pixmap); @@ -1008,12 +1008,12 @@ Sect5::Sect5(ListViewInterface *parent, ListViewInterface *after, TQString label m_valueList.append( TQString("Sect5") ); // XmlContextName m_valueList.append( (bool)false ); // isEditable m_valueList.append( (int)0 ); // MaxLines - m_valueList.append(TQString::null); // Summary - m_valueList.append(TQString::null); // RawData - m_valueList.append(TQString::null); // RTFHeader - m_valueList.append(TQString::null); // RTFData - m_valueList.append(TQString::null); // SpeakerHeader - m_valueList.append(TQString::null); // SpeakerData + m_valueList.append(TQString()); // Summary + m_valueList.append(TQString()); // RawData + m_valueList.append(TQString()); // RTFHeader + m_valueList.append(TQString()); // RTFData + m_valueList.append(TQString()); // SpeakerHeader + m_valueList.append(TQString()); // SpeakerData // new Concept (end) } @@ -1046,7 +1046,7 @@ bool Sect5::setValue( unsigned int index, TQVariant data ) TQVariant Sect5::getValue( unsigned int index ) const { if ( index > m_valueList.count() ) - return TQVariant(); // a invalid QVariant + return TQVariant(); // a invalid TQVariant TQVariant data; data = m_valueList[index]; diff --git a/ksayit/src/docbookclasses.h b/ksayit/src/docbookclasses.h index e7a891f..e24af91 100644 --- a/ksayit/src/docbookclasses.h +++ b/ksayit/src/docbookclasses.h @@ -12,7 +12,7 @@ #ifndef DOCBOOKCLASSES_H #define DOCBOOKCLASSES_H -// Qt includes +// TQt includes #include <tqstring.h> #include <tqvariant.h> @@ -32,7 +32,7 @@ class TQStringList; // /** Represents the root item of the document, therefore it expects - a \p TQListView object as parent.\n + a \p TQListView object as tqparent.\n Structural item only (no references to a DOM node). @author Robert Vogl */ @@ -41,11 +41,11 @@ class RobDocument : public ListViewInterface public: /** * Constructor - * \param lv The ListView parent. + * \param lv The ListView tqparent. * \param label The label is shown in column 0 of the TreeView and is also * used as bookmark title. */ - RobDocument(KListView *lv=0, TQString label=TQString::null); + RobDocument(KListView *lv=0, TQString label=TQString()); ~RobDocument(); bool setValue( unsigned int index, TQVariant data ); @@ -67,7 +67,7 @@ private: class Overview : public ListViewInterface { public: - Overview(ListViewInterface *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Overview(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Date(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + ReleaseInfo(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + AuthorGroup(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Author(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + KeywordSet(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Keyword(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Abstract(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Para(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Chapter(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Sect1(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Sect2(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Sect3(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Sect4(ListViewInterface *tqparent=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 *parent=0, ListViewInterface *after=0, TQString label=TQString::null); + Sect5(ListViewInterface *tqparent=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 4b792b2..a6f8a72 100644 --- a/ksayit/src/docbookgenerator.cpp +++ b/ksayit/src/docbookgenerator.cpp @@ -10,7 +10,7 @@ // // -// Qt includes +// TQt includes #include <tqstring.h> #include <tqvariant.h> @@ -105,10 +105,10 @@ void DocbookGenerator::writeTitleOfBook(TQTextStream &doc, ListViewInterface *it if ( whoAmI != "BookInfo" ) return; - // Documents title is stored in root element (parent of BookInfo) - ListViewInterface *parent = static_cast<ListViewInterface*>(item->parent()); - if ( parent ){ - TQString title = parent->text(0); + // Documents title is stored in root element (tqparent of BookInfo) + ListViewInterface *tqparent = static_cast<ListViewInterface*>(item->tqparent()); + if ( tqparent ){ + TQString title = tqparent->text(0); // add node to document doc << "<Title>" << title << "</Title>" << endl; @@ -151,7 +151,7 @@ void DocbookGenerator::writeAuthor(TQTextStream &doc, ListViewInterface *item) if ( whoAmI != "Author" ) return; - TQString author = TQString::null; + TQString author = TQString(); author = ( item->getValue(KSayItGlobal::RAWDATA) ).toString(); // add node to document @@ -231,7 +231,7 @@ void DocbookGenerator::writeKeyword(TQTextStream &doc, ListViewInterface *item) return; // TQString keyword = item->text( 0 ); - TQString keyword = TQString::null; + TQString keyword = TQString(); keyword = (item->getValue(3)).toString(); // add node to document diff --git a/ksayit/src/docbookgenerator.h b/ksayit/src/docbookgenerator.h index b5fb251..109d0c5 100644 --- a/ksayit/src/docbookgenerator.h +++ b/ksayit/src/docbookgenerator.h @@ -12,7 +12,7 @@ #ifndef DOCBOOKGENERATOR_H #define DOCBOOKGENERATOR_H -// Qt includes +// TQt includes #include <tqtextstream.h> // KDE includes diff --git a/ksayit/src/docbookparser.cpp b/ksayit/src/docbookparser.cpp index 679a44b..f1e0c51 100644 --- a/ksayit/src/docbookparser.cpp +++ b/ksayit/src/docbookparser.cpp @@ -10,7 +10,7 @@ // // -// Qt includes +// TQt includes #include <tqregexp.h> #include <tqstring.h> #include <tqtextstream.h> @@ -58,7 +58,7 @@ TQString DocbookParser::node2raw(TQDomNode node) const void DocbookParser::parseBook(const TQDomElement &element, ListViewInterface *item) { kdDebug(100200) << "+++ entering parseBook()" << endl; - item->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + item->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( item ); @@ -89,7 +89,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface kdDebug(100200) << "+++ entering parseBookInfo()" << endl; Overview *overview = new Overview(item, NULL, i18n("Overview")); - overview->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + overview->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( overview ); @@ -122,7 +122,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface data = node.firstChild().toText(); if( !data.isNull() ){ Date *date = new Date(overview, NULL, i18n("Date")); - date->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + date->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); date->setText( 1, data.nodeValue() ); date->setValue(KSayItGlobal::RTFDATA, data.nodeValue()); date->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue()); @@ -140,7 +140,7 @@ void DocbookParser::parseBookInfo(const TQDomElement &element, ListViewInterface data = node.firstChild().toText(); if( !data.isNull() ){ ReleaseInfo *relinfo = new ReleaseInfo(overview, NULL, i18n("Release")); - relinfo->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + relinfo->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); relinfo->setText( 1, data.nodeValue() ); relinfo->setValue(KSayItGlobal::RTFDATA, data.nodeValue()); relinfo->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue()); @@ -176,7 +176,7 @@ void DocbookParser::parseAuthorGroup(const TQDomElement &element, ListViewInterf // item = overview AuthorGroup *authorgroup = new AuthorGroup(item, NULL, i18n("Author(s)")); - authorgroup->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + authorgroup->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( authorgroup ); @@ -199,11 +199,11 @@ void DocbookParser::parseAuthor(const TQDomElement &element, ListViewInterface * TQDomText data; TQDomText firstname = TQDomText(); TQDomText surname = TQDomText(); - TQString s_firstname = TQString::null; - TQString s_surname = TQString::null; + TQString s_firstname = TQString(); + TQString s_surname = TQString(); Author *author = new Author(item); - author->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + author->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); TQDomNode node = element.firstChild(); while( !node.isNull() ){ @@ -241,7 +241,7 @@ void DocbookParser::parseKeywordSet(const TQDomElement &element, ListViewInterfa // item = overview KeywordSet *keywordset = new KeywordSet(item, NULL, i18n("Keywords")); - keywordset->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + keywordset->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( keywordset ); @@ -252,7 +252,7 @@ void DocbookParser::parseKeywordSet(const TQDomElement &element, ListViewInterfa data = node.firstChild().toText(); if( !data.isNull() ){ Keyword *keyword = new Keyword(keywordset); - keyword->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + keyword->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); keyword->setText(0, data.nodeValue() ); keyword->setValue(KSayItGlobal::RTFDATA, data.nodeValue() ); keyword->setValue(KSayItGlobal::SPEAKERDATA, data.nodeValue() ); @@ -275,7 +275,7 @@ void DocbookParser::parseAbstract(const TQDomElement &element, ListViewInterface // item = overview TQDomText data; Abstract *abstract = new Abstract(item, NULL, i18n("Abstract")); - abstract->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + abstract->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( abstract ); @@ -296,7 +296,7 @@ void DocbookParser::parseChapter(const TQDomElement &element, ListViewInterface TQDomText data; Chapter *chapter = new Chapter(item, NULL, i18n("Chapter")); - chapter->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + chapter->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( chapter ); @@ -326,7 +326,7 @@ void DocbookParser::parseSect1(const TQDomElement &element, ListViewInterface *i TQDomText data; Sect1 *sect1 = new Sect1(item, NULL, i18n("Section Level 1")); - sect1->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + sect1->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( sect1 ); @@ -356,7 +356,7 @@ void DocbookParser::parseSect2(const TQDomElement &element, ListViewInterface *i TQDomText data; Sect2 *sect2 = new Sect2(item, NULL, i18n("Section Level 2")); - sect2->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + sect2->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( sect2 ); @@ -386,7 +386,7 @@ void DocbookParser::parseSect3(const TQDomElement &element, ListViewInterface *i TQDomText data; Sect3 *sect3 = new Sect3(item, NULL, i18n("Section Level 3")); - sect3->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + sect3->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( sect3 ); @@ -416,7 +416,7 @@ void DocbookParser::parseSect4(const TQDomElement &element, ListViewInterface *i TQDomText data; Sect4 *sect4 = new Sect4(item, NULL, i18n("Section Level 4")); - sect4->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + sect4->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( sect4 ); @@ -446,7 +446,7 @@ void DocbookParser::parseSect5(const TQDomElement &element, ListViewInterface *i TQDomText data; Sect5 *sect5 = new Sect5(item, NULL, i18n("Section Level 4")); - sect5->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + sect5->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( sect5 ); @@ -473,15 +473,15 @@ void DocbookParser::parsePara(const TQDomElement &element, ListViewInterface *it kdDebug(100200) << "+++ entering parsePara()" << endl; Para *para = new Para(item, NULL, i18n("Paragraph")); - para->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + para->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); // register Popup menu m_contextmenuhandler->registerPopupMenu( para ); TQString raw = node2raw(element); // remove <para> tags - raw.replace( TQRegExp("</?(para|Para|PARA)/?>"),""); - raw.replace( TQRegExp("^ "),"" ); - raw.replace( TQRegExp("^\n"), "" ); + raw.tqreplace( TQRegExp("</?(para|Para|PARA)/?>"),""); + raw.tqreplace( TQRegExp("^ "),"" ); + raw.tqreplace( TQRegExp("^\n"), "" ); para->setValue(KSayItGlobal::RAWDATA, raw); para->setValue(KSayItGlobal::RTFDATA, raw); diff --git a/ksayit/src/docbookparser.h b/ksayit/src/docbookparser.h index 5c84e30..66deb91 100644 --- a/ksayit/src/docbookparser.h +++ b/ksayit/src/docbookparser.h @@ -12,7 +12,7 @@ #ifndef DOCBOOKPARSER_H #define DOCBOOKPARSER_H -// Qt includes +// TQt includes #include <tqdom.h> // KDE includes diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp index 11e22ce..5776917 100644 --- a/ksayit/src/doctreeviewimpl.cpp +++ b/ksayit/src/doctreeviewimpl.cpp @@ -11,7 +11,7 @@ // #include <stdlib.h> // getenv -// Qt includes +// TQt includes #include <tqdom.h> #include <tqfile.h> #include <tqwidget.h> @@ -41,8 +41,8 @@ ////////////////////////////////////// // TreeView Implementation ////////////////////////////////////// -DocTreeViewImpl::DocTreeViewImpl(TQWidget* parent, const char* name, WFlags fl) - : DocTreeView(parent, name, fl) +DocTreeViewImpl::DocTreeViewImpl(TQWidget* tqparent, const char* name, WFlags fl) + : DocTreeView(tqparent, name, fl) { m_rootItem = NULL; m_url = KURL(); @@ -66,7 +66,7 @@ DocTreeViewImpl::DocTreeViewImpl(TQWidget* parent, const char* name, WFlags fl) m_currentItem = m_rootItem; m_parasaxparser = ParaSaxParser::Instance(); m_editMode = false; - m_changedContent = TQString::null; + m_changedContent = TQString(); m_contextmenuhandler = NULL; m_contextmenu = NULL; @@ -86,7 +86,7 @@ DocTreeViewImpl::~DocTreeViewImpl() void DocTreeViewImpl::enableContextMenus( bool enabled ) { if ( enabled ){ - m_contextmenuhandler = new ContextMenuHandler(this, "contextmenuhandler"); + m_contextmenuhandler = new ContextMenuHandler(TQT_TQOBJECT(this), "contextmenuhandler"); } else { if ( m_contextmenuhandler ) delete m_contextmenuhandler; @@ -105,7 +105,7 @@ void DocTreeViewImpl::clear() // inform BookmarkHandler // - emit signalSetBookmarkFilename( TQString::null ); + emit signalSetBookmarkFilename( TQString() ); listView->clear(); m_rootItem = new RobDocument( listView, i18n("unnamed") ); @@ -193,11 +193,11 @@ void DocTreeViewImpl::openFile(const KURL &url) if( domTree.setContent(&file) ){ // extract Header file.reset(); - TQString header = TQString::null; + TQString header = TQString(); TQString line; int offset; file.readLine( line, file.size() ); - while( !file.atEnd() && (offset = line.find("<book", 0, false)) < 0 ){ + while( !file.atEnd() && (offset = line.tqfind("<book", 0, false)) < 0 ){ header += line; file.readLine( line, file.size() ); } @@ -261,7 +261,7 @@ void DocTreeViewImpl::openFile(const KURL &url) docbookparser.parseBook(root , m_rootItem); m_idCounter = docbookparser.getIdCounter(); } else { - err = i18n("The file is of type %1, 'book' expected.").arg(root.tagName() ); + err = i18n("The file is of type %1, 'book' expected.").tqarg(root.tagName() ); throw(err); } @@ -329,7 +329,7 @@ void DocTreeViewImpl::saveFileAs() makeCurrentNodePersistent(); - m_url = KFileDialog::getSaveURL(TQString::null, "*.docbook", this, i18n("Save File As")); + m_url = KFileDialog::getSaveURL(TQString(), "*.docbook", this, i18n("Save File As")); if ( m_url.isEmpty() ) // dialog cancelled return; if ( !m_url.isValid() ){ @@ -391,9 +391,9 @@ void DocTreeViewImpl::setEditMode(bool mode) void DocTreeViewImpl::makeToSingleLine( TQString &content ) { // canonify string - content.replace( TQRegExp("\n"), "" ); // remove Newlines - content.replace( TQRegExp(" {2,}"), " " ); // remove multiple spaces - content.replace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs + content.tqreplace( TQRegExp("\n"), "" ); // remove Newlines + content.tqreplace( TQRegExp(" {2,}"), " " ); // remove multiple spaces + content.tqreplace( TQRegExp("[\t|\r]{1,}"), ""); // remove Tabs } @@ -402,10 +402,10 @@ TQString DocTreeViewImpl::selectItemByID(const TQString &ID, const TQString titl kdDebug(100200) << "DocTreeViewImpl::selectItemByID(" << ID << ")" << endl; if ( ID.isNull() ) - return TQString::null; + return TQString(); TQString sTitle = title.lower(); - TQString err = TQString::null; + TQString err = TQString(); /** * Search on structure (URL) @@ -416,7 +416,7 @@ TQString DocTreeViewImpl::selectItemByID(const TQString &ID, const TQString titl TQStringList::Iterator it = partList.begin(); it++; // skip first element (allways RobDocument) int childNum = 0; - TQString childType = TQString::null; + TQString childType = TQString(); ListViewInterface *item = m_rootItem; bool hit = false; @@ -459,7 +459,7 @@ TQString DocTreeViewImpl::selectItemByID(const TQString &ID, const TQString titl // with the given title. item = NULL; TQListViewItemIterator sit( m_rootItem ); - TQString itemTitle = TQString::null; + TQString itemTitle = TQString(); while ( sit.current() ) { item = static_cast<ListViewInterface*>(sit.current()); if ( !item ) @@ -503,7 +503,7 @@ void DocTreeViewImpl::slotItemClicked(TQListViewItem *item) if ( item ){ m_currentItem = static_cast<ListViewInterface*>(item); - TQString str = TQString::null; + TQString str = TQString(); TQTextStream msg(&str, IO_ReadWrite); msg.setEncoding(TQTextStream::UnicodeUTF8); @@ -517,7 +517,7 @@ void DocTreeViewImpl::slotItemClicked(TQListViewItem *item) // Create Bookmark-ID depending on the location of the item // within the tree - TQString idstring = TQString::null; + TQString idstring = TQString(); TQTextStream id(&idstring, IO_ReadWrite); id.setEncoding(TQTextStream::UnicodeUTF8); id << "1=RobDocument"; @@ -553,21 +553,21 @@ void DocTreeViewImpl::recursiveBuildItemIdentifier(ListViewInterface* item, TQTe if ( !item ) return; - // 1. Do we have a parent (=parentItem)? + // 1. Do we have a tqparent (=tqparentItem)? // If no -> return, if yes -> recursive call - ListViewInterface *parentItem = NULL; - parentItem = static_cast<ListViewInterface*>( item->parent() ); - if ( parentItem ){ - recursiveBuildItemIdentifier( parentItem, idstring ); + ListViewInterface *tqparentItem = NULL; + tqparentItem = static_cast<ListViewInterface*>( item->tqparent() ); + if ( tqparentItem ){ + recursiveBuildItemIdentifier( tqparentItem, idstring ); } else { // break recursion return; } - // 2. Which child of the parentItem are we? Append no. to idstring. + // 2. Which child of the tqparentItem are we? Append no. to idstring. int childno = 0; TQString itemID = item->text(3); - ListViewInterface *i = static_cast<ListViewInterface*>( parentItem->firstChild() ); + ListViewInterface *i = static_cast<ListViewInterface*>( tqparentItem->firstChild() ); while( i ){ childno++; if ( i->text(3) == itemID ) @@ -585,17 +585,17 @@ void DocTreeViewImpl::recursiveBuildItemIdentifier(ListViewInterface* item, TQTe TQString DocTreeViewImpl::getItemTitle( ListViewInterface *item ) { if ( !item ) - return TQString::null; + return TQString(); TQString col0 = item->text(0); - TQString title = TQString::null; + TQString title = TQString(); // if ( col0 == i18n("Paragraph") ){ // better to use XmlContextName? if( (item->getValue(KSayItGlobal::XMLCONTEXTNAME)).toString() == i18n("Paragraph") ){ title = ( item->getValue(KSayItGlobal::SPEAKERDATA) ).toString().left(32); // canonify string - title.replace( TQRegExp("^( |\t|\n)+"), ""); - title.replace( TQRegExp("( |\t|\n)$+"), ""); + title.tqreplace( TQRegExp("^( |\t|\n)+"), ""); + title.tqreplace( TQRegExp("( |\t|\n)$+"), ""); } else { title = col0.left(32); } @@ -700,7 +700,7 @@ void DocTreeViewImpl::makeCurrentNodePersistent() m_currentItem->setValue( KSayItGlobal::RTFDATA, m_changedContent ); m_currentItem->setValue( KSayItGlobal::SPEAKERDATA, m_changedContent ); - m_changedContent = TQString::null; + m_changedContent = TQString(); } /** replaced by slotRightButtonPressed() @@ -756,13 +756,13 @@ void DocTreeViewImpl::slotDeleteItem() kdDebug(100200) << "DocTreeViewImpl::slotDeleteItem()" << endl; ListViewInterface *itemToDelete = m_currentItem; - ListViewInterface *parentItem = NULL; - parentItem = static_cast<ListViewInterface*>(itemToDelete->parent()); - if ( !parentItem ) - return; // delete only items with parent + ListViewInterface *tqparentItem = NULL; + tqparentItem = static_cast<ListViewInterface*>(itemToDelete->tqparent()); + if ( !tqparentItem ) + return; // delete only items with tqparent // try to delete bookmark - TQString url = TQString::null; + TQString url = TQString(); TQTextStream id(&url, IO_ReadWrite); id.setEncoding(TQTextStream::UnicodeUTF8); id << "ksayit://1=RobDocument"; @@ -779,15 +779,15 @@ void DocTreeViewImpl::slotDeleteItem() TQListViewItemIterator itr( m_rootItem ); while ( itr.current() ) { item = static_cast<ListViewInterface*>(itr.current()); - item->setText(3, TQString("%1").arg(++m_idCounter).rightJustify(8,'0') ); + item->setText(3, TQString("%1").tqarg(++m_idCounter).rightJustify(8,'0') ); ++itr; } // show m_rootItem->sort(); - listView->setSelected( parentItem, true ); - listView->ensureItemVisible( parentItem ); - slotItemClicked( parentItem ); + listView->setSelected( tqparentItem, true ); + listView->ensureItemVisible( tqparentItem ); + slotItemClicked( tqparentItem ); } @@ -797,7 +797,7 @@ void DocTreeViewImpl::slotNewBookInfo() if ( whoAmI == "RobDocument" ){ int newIndex = newIndexFirstChild(); Overview *overview = new Overview( m_currentItem, NULL, i18n("Overview") ); - overview->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + overview->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); m_contextmenuhandler->registerPopupMenu( overview ); } @@ -810,7 +810,7 @@ void DocTreeViewImpl::slotNewChapter() if ( whoAmI == "RobDocument" ){ int newIndex = newIndexLastChild(); Chapter *chapter = new Chapter( m_currentItem, NULL, i18n("Chapter") ); - chapter->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + chapter->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Chapter Title"); chapter->setText(0, newTitle ); @@ -829,7 +829,7 @@ void DocTreeViewImpl::slotNewKeywordSet() // New TreeView item int newIndex = newIndexFirstChild(); KeywordSet *keywordset = new KeywordSet(m_currentItem, NULL, i18n("Keywords")); - keywordset->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + keywordset->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); m_contextmenuhandler->registerPopupMenu( keywordset ); } @@ -843,7 +843,7 @@ void DocTreeViewImpl::slotNewKeyword() // New TreeView item int newIndex = newIndexLastChild(); Keyword *keyword = new Keyword(m_currentItem, NULL, i18n("Keyword")); - keyword->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + keyword->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); TQString newKeyword = i18n("New Keyword"); keyword->setText(0, newKeyword ); @@ -863,7 +863,7 @@ void DocTreeViewImpl::slotNewAbstract() // New TreeView item int newIndex = newIndexLastChild(); Abstract *abstract = new Abstract(m_currentItem, NULL, i18n("Abstract")); - abstract->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + abstract->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); m_contextmenuhandler->registerPopupMenu( abstract ); @@ -883,7 +883,7 @@ void DocTreeViewImpl::slotNewAuthorGroup() // New TreeView item int newIndex = newIndexFirstChild(); AuthorGroup *authorgroup = new AuthorGroup(m_currentItem, NULL, i18n("Author(s)")); - authorgroup->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + authorgroup->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); m_contextmenuhandler->registerPopupMenu( authorgroup ); @@ -903,7 +903,7 @@ void DocTreeViewImpl::slotNewAuthor() // New TreeView item int newIndex = newIndexLastChild(); Author *author = new Author(m_currentItem); - author->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + author->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); author->setText(0, i18n("Author") ); TQString newAuthor = i18n("Firstname Surname"); @@ -924,10 +924,10 @@ void DocTreeViewImpl::slotNewDate() // New TreeView item int newIndex = newIndexLastChild(); Date *date = new Date(m_currentItem, NULL, i18n("Date")); - date->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + date->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); // get current date TQString today; - today = KGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true); + today = KGlobal::locale()->formatDate(TQDate::tqcurrentDate(Qt::LocalTime), true); date->setText( 1, today); date->setValue( KSayItGlobal::RAWDATA, today ); date->setValue( KSayItGlobal::RTFDATA, today ); @@ -945,7 +945,7 @@ void DocTreeViewImpl::slotNewReleaseInfo() // New TreeView item int newIndex = newIndexLastChild(); ReleaseInfo *relinfo = new ReleaseInfo(m_currentItem, NULL, i18n("Release")); - relinfo->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + relinfo->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); TQString newRelease = "0.0.0"; relinfo->setText( 1, newRelease ); @@ -966,20 +966,20 @@ void DocTreeViewImpl::slotNewTitle() void DocTreeViewImpl::slotNewParagraph() { /* // Create Null element - TQDomElement parentElement = TQDomElement(); + TQDomElement tqparentElement = TQDomElement(); NodeList_type list; list.clear(); m_currentItem->getNodes( list ); - parentElement = (list.front()).toElement(); + tqparentElement = (list.front()).toElement(); - if ( parentElement.isNull() ) + if ( tqparentElement.isNull() ) return; */ // New TreeView item int newIndex = newIndexLastChild(); Para *para = new Para(m_currentItem, NULL, i18n("Paragraph")); - para->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + para->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); m_contextmenuhandler->registerPopupMenu( para ); @@ -992,7 +992,7 @@ void DocTreeViewImpl::slotNewSection_1() if ( whoAmI == "Chapter" ){ int newIndex = newIndexLastChild(); Sect1 *sect1 = new Sect1(m_currentItem, NULL, i18n("Section Level 1")); - sect1->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + sect1->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Section Title"); sect1->setValue( KSayItGlobal::RTFHEADER, newTitle ); @@ -1009,7 +1009,7 @@ void DocTreeViewImpl::slotNewSection_2() if ( whoAmI == "Sect1" ){ int newIndex = newIndexLastChild(); Sect2 *sect2 = new Sect2(m_currentItem, NULL, i18n("Section Level 2")); - sect2->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + sect2->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Section Title"); sect2->setValue( KSayItGlobal::RTFHEADER, newTitle ); @@ -1026,7 +1026,7 @@ void DocTreeViewImpl::slotNewSection_3() if ( whoAmI == "Sect2" ){ int newIndex = newIndexLastChild(); Sect3 *sect3 = new Sect3(m_currentItem, NULL, i18n("Section Level 3")); - sect3->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + sect3->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Section Title"); sect3->setValue( KSayItGlobal::RTFHEADER, newTitle ); @@ -1043,7 +1043,7 @@ void DocTreeViewImpl::slotNewSection_4() if ( whoAmI == "Sect3" ){ int newIndex = newIndexLastChild(); Sect4 *sect4 = new Sect4(m_currentItem, NULL, i18n("Section Level 4")); - sect4->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + sect4->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Section Title"); sect4->setValue( KSayItGlobal::RTFHEADER, newTitle ); @@ -1060,7 +1060,7 @@ void DocTreeViewImpl::slotNewSection_5() if ( whoAmI == "Sect4" ){ int newIndex = newIndexLastChild(); Sect5 *sect5 = new Sect5(m_currentItem, NULL, i18n("Section Level 5")); - sect5->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') ); + sect5->setText(3, TQString("%1").tqarg(newIndex).rightJustify(8,'0') ); TQString newTitle = i18n("New Section Title"); sect5->setValue( KSayItGlobal::RTFHEADER, newTitle ); @@ -1086,7 +1086,7 @@ int DocTreeViewImpl::newIndexFirstChild() item = static_cast<ListViewInterface*>(it.current()); itemIndex = (item->text(3)).toInt(); if ( itemIndex > currentIndex ){ - item->setText(3, TQString("%1").arg(itemIndex+1).rightJustify(8,'0') );; + item->setText(3, TQString("%1").tqarg(itemIndex+1).rightJustify(8,'0') );; } ++it; } @@ -1116,7 +1116,7 @@ int DocTreeViewImpl::newIndexLastChild() item = static_cast<ListViewInterface*>(it.current()); itemIndex = (item->text(3)).toInt(); if ( itemIndex > lastIndex ){ - item->setText(3, TQString("%1").arg(itemIndex+1).rightJustify(8,'0') ); + item->setText(3, TQString("%1").tqarg(itemIndex+1).rightJustify(8,'0') ); } ++it; } diff --git a/ksayit/src/doctreeviewimpl.h b/ksayit/src/doctreeviewimpl.h index c42cab8..f461b84 100644 --- a/ksayit/src/doctreeviewimpl.h +++ b/ksayit/src/doctreeviewimpl.h @@ -12,7 +12,7 @@ #ifndef DOCTREEVIEWIMPL_H #define DOCTREEVIEWIMPL_H -// Qt includes +// TQt includes #include <tqstring.h> // KDE includes @@ -40,7 +40,7 @@ all required methods to access or manipulate its content. class DocTreeViewImpl : public DocTreeView { public: - DocTreeViewImpl(TQWidget* parent=0, const char* name=0, WFlags fl=0); + DocTreeViewImpl(TQWidget* tqparent=0, const char* name=0, WFlags fl=0); ~DocTreeViewImpl(); @@ -102,7 +102,7 @@ public: /** * Sets the item active designated by the ID. * \param ID The ID (column 3) of the TreeView item. - * \returns <tt>TQString::null</tt> if the operation was successfull,\n + * \returns <tt>TQString()</tt> if the operation was successfull,\n * an error message, if the item was not found. */ TQString selectItemByID(const TQString &ID, const TQString title); diff --git a/ksayit/src/effectstack.cpp b/ksayit/src/effectstack.cpp index 67cfb44..75ef7f5 100644 --- a/ksayit/src/effectstack.cpp +++ b/ksayit/src/effectstack.cpp @@ -10,7 +10,7 @@ // // -// Qt includes +// TQt includes #include <tqstringlist.h> // KDE includes diff --git a/ksayit/src/fx_setup.ui b/ksayit/src/fx_setup.ui index 60ad57d..056ceb0 100644 --- a/ksayit/src/fx_setup.ui +++ b/ksayit/src/fx_setup.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>FX_Setup</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FX_Setup</cstring> </property> @@ -22,23 +22,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout7</cstring> + <cstring>tqlayout7</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel_available</cstring> </property> @@ -46,11 +46,11 @@ <string>Available:</string> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>listBox_Available</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>170</height> @@ -59,9 +59,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <vbox> <property name="name"> @@ -77,18 +77,18 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> </size> </property> </spacer> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>toolButton_add</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -101,11 +101,11 @@ <iconset>image0</iconset> </property> </widget> - <widget class="QToolButton"> + <widget class="TQToolButton"> <property name="name"> <cstring>toolButton_remove</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>30</width> <height>32767</height> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -137,15 +137,15 @@ </spacer> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel_active</cstring> </property> @@ -153,11 +153,11 @@ <string>Active:</string> </property> </widget> - <widget class="QListBox"> + <widget class="TQListBox"> <property name="name"> <cstring>listBox_Active</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>150</width> <height>170</height> @@ -171,9 +171,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> @@ -189,14 +189,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>40</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>pushButton_removeAll</cstring> </property> @@ -237,16 +237,16 @@ </connection> <connection> <sender>listBox_Active</sender> - <signal>doubleClicked(QListBoxItem*)</signal> + <signal>doubleClicked(TQListBoxItem*)</signal> <receiver>FX_Setup</receiver> - <slot>slotConfigureEffect(QListBoxItem*)</slot> + <slot>slotConfigureEffect(TQListBoxItem*)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>slotAdd()</slot> <slot>slotRemove()</slot> <slot>slotRemoveAll()</slot> - <slot>slotConfigureEffect(QListBoxItem*)</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> + <slot>slotConfigureEffect(TQListBoxItem*)</slot> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> </UI> diff --git a/ksayit/src/fxpluginhandler.cpp b/ksayit/src/fxpluginhandler.cpp index ec68de8..fc5ed5d 100644 --- a/ksayit/src/fxpluginhandler.cpp +++ b/ksayit/src/fxpluginhandler.cpp @@ -26,8 +26,8 @@ #include "ksayit_ttsplugin.h" -FXPluginHandler::FXPluginHandler(TQObject *parent, const char *name, KConfig *config) - : TQObject(parent, name), m_config(config) +FXPluginHandler::FXPluginHandler(TQObject *tqparent, const char *name, KConfig *config) + : TQObject(tqparent, name), m_config(config) { m_mapPluginList.clear(); m_lstActivePlugins.clear(); @@ -58,8 +58,8 @@ void FXPluginHandler::searchPlugins() KTrader::OfferList offers = KTrader::self()->query("KSayIt/FXPlugin"); KLibFactory *factory = NULL; - TQString library = TQString::null; - TQString name = TQString::null; + TQString library = TQString(); + TQString name = TQString(); KTrader::OfferList::Iterator it=offers.begin(); for ( ;it!=offers.end(); ++it ){ @@ -70,11 +70,11 @@ void FXPluginHandler::searchPlugins() if ( factory ){ kdDebug(100200) << "FXPluginHandler::searchPlugins(): Plugin factory found." << endl; // register found plugin - if ( !sRegistered.contains( TQString(name) )){ + if ( !sRegistered.tqcontains( TQString(name) )){ sRegistered.append( TQString(name) ); plugin.name = name; plugin.library = library; - plugin.description = TQString::null; + plugin.description = TQString(); plugin.EffectID = 0; plugin.p = NULL; m_mapPluginList[plugin.name] = plugin; // update Plugin Map @@ -96,7 +96,7 @@ void FXPluginHandler::readConfiguration() // unload all plugins and destroy the effect objects lit = m_lstActivePlugins.begin(); while ( lit != m_lstActivePlugins.end() ){ - mit = m_mapPluginList.find( *lit ); + mit = m_mapPluginList.tqfind( *lit ); if ( mit!=m_mapPluginList.end() ){ plugin = *mit; if ( (plugin.p != NULL) && (plugin.EffectID == 0) ){ @@ -116,7 +116,7 @@ void FXPluginHandler::readConfiguration() KLibFactory *factory = NULL; for (lit=conf_active.begin(); lit!=conf_active.end(); ++lit){ // for all in config - mit = m_mapPluginList.find(*lit); + mit = m_mapPluginList.tqfind(*lit); if( mit!=m_mapPluginList.end() ){ // plugin found in list of registered plugins plugin = *mit; @@ -146,7 +146,7 @@ void FXPluginHandler::showEffectGUI(const TQString &pname) fx_struct plugin; // find plugin with name==pname in list and show its GUI - mit = m_mapPluginList.find(pname); + mit = m_mapPluginList.tqfind(pname); if ( mit != m_mapPluginList.end() ){ plugin = *mit; if ( plugin.p != NULL ){ // plugin loaded @@ -198,7 +198,7 @@ void FXPluginHandler::activateEffect(const TQString &pname, fx_struct plugin; // find plugin with name==pname - mit = m_mapPluginList.find(pname); + mit = m_mapPluginList.tqfind(pname); if ( mit!=m_mapPluginList.end() ){ plugin = *mit; if ( plugin.p != NULL ){ diff --git a/ksayit/src/fxpluginhandler.h b/ksayit/src/fxpluginhandler.h index 43c820f..ca4aa21 100644 --- a/ksayit/src/fxpluginhandler.h +++ b/ksayit/src/fxpluginhandler.h @@ -44,11 +44,12 @@ typedef struct { } fx_struct; -class FXPluginHandler : public QObject +class FXPluginHandler : public TQObject { Q_OBJECT + TQ_OBJECT public: - FXPluginHandler(TQObject *parent = 0, const char *name = 0, KConfig *config=0); + FXPluginHandler(TQObject *tqparent = 0, const char *name = 0, KConfig *config=0); ~FXPluginHandler(); public: // Methods diff --git a/ksayit/src/fxsetupimpl.cpp b/ksayit/src/fxsetupimpl.cpp index fc0100e..9f18b81 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 *parent, const char *name, +FX_SetupImpl::FX_SetupImpl(TQWidget *tqparent, const char *name, KConfig *config, FXPluginHandler *fxpluginhandler ) - : FX_Setup(parent,name), m_config(config), m_fxpluginhandler(fxpluginhandler) + : FX_Setup(tqparent,name), m_config(config), m_fxpluginhandler(fxpluginhandler) { m_fxpluginhandler->getPlugins(pluginlist); @@ -109,7 +109,7 @@ void FX_SetupImpl::Init(TQStringList c_avail) pushButton_removeAll->setEnabled(false); for (sit=conf_active.begin(); sit!=conf_active.end(); ++sit){ - it = c_avail.find(*sit); + it = c_avail.tqfind(*sit); if ( it!=c_avail.end() ){ // active plugin as per config-file in pluginlist found c_active.append(*sit); // append to active list c_avail.remove(*sit); // remove active plugin from the list of avail plugins diff --git a/ksayit/src/fxsetupimpl.h b/ksayit/src/fxsetupimpl.h index ac256ed..fc868e6 100644 --- a/ksayit/src/fxsetupimpl.h +++ b/ksayit/src/fxsetupimpl.h @@ -37,9 +37,10 @@ class FXPluginHandler; */ class FX_SetupImpl : public FX_Setup { Q_OBJECT + TQ_OBJECT public: - FX_SetupImpl(TQWidget *parent=0, const char *name=0, + FX_SetupImpl(TQWidget *tqparent=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 877c60a..bdf772c 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* parent, const char* name, WFlags f, +KSayItApp::KSayItApp(TQWidget* tqparent, const char* name, WFlags f, const TQCString &objID) - : KMainWindow(parent, name, f), DCOPObject(objID) + : KMainWindow(tqparent, name, f), DCOPObject(objID) { config = NULL; view = NULL; @@ -67,10 +67,10 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f, bkManager = NULL; bkHandler = NULL; bkMenu = NULL; - m_currentBookmarkFile = TQString::null; + m_currentBookmarkFile = TQString(); config=kapp->config(); - m_kttslib = new KTTSDLib(this, "KTTSD-Library", kapp); + m_kttslib = new KTTSDLib(TQT_TQOBJECT(this), "KTTSD-Library", kapp); initView(); initStatusBar(); @@ -84,31 +84,31 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f, // connect TTS plugin handler to this object connect(m_kttslib, TQT_SIGNAL(signalFinished()), - this, TQT_SLOT(slotTTSFinished()) ); + TQT_TQOBJECT(this), TQT_SLOT(slotTTSFinished()) ); // only used if library thinks it has to call the preferences dialog. // e.g. when it detects a bad configuration. connect(m_kttslib, TQT_SIGNAL(signalCallPreferences()), - this, TQT_SLOT(slotPreferences()) ); + TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()) ); // init Clipboard - cb = TQApplication::clipboard(); - connect(cb, TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotClipboardChanged()) ); + cb = TQApplication::tqclipboard(); + connect(cb, TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotClipboardChanged()) ); // create SystemTray object tray = new KSayItSystemTray(this, "system_tray"); - connect(tray, TQT_SIGNAL(signalCallPreferences()), this, TQT_SLOT(slotPreferences()) ); - connect(tray, TQT_SIGNAL(signalSayActivated()), this, TQT_SLOT(slotSayText()) ); - connect(tray, TQT_SIGNAL(signalSayClipboard()), this, TQT_SLOT(slotSayClipboard()) ); - connect(tray, TQT_SIGNAL(signalShutUpActivated()), this, TQT_SLOT(slotStopActivated()) ); - connect(tray, TQT_SIGNAL(signalPauseActivated()), this, TQT_SLOT(slotPauseActivated()) ); - connect(tray, TQT_SIGNAL(signalNextActivated()), this, TQT_SLOT(slotNextSentenceActivated()) ); - connect(tray, TQT_SIGNAL(signalPrevActivated()), this, TQT_SLOT(slotPrevSentenceActivated()) ); + connect(tray, TQT_SIGNAL(signalCallPreferences()), TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()) ); + connect(tray, TQT_SIGNAL(signalSayActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotSayText()) ); + connect(tray, TQT_SIGNAL(signalSayClipboard()), TQT_TQOBJECT(this), TQT_SLOT(slotSayClipboard()) ); + connect(tray, TQT_SIGNAL(signalShutUpActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotStopActivated()) ); + connect(tray, TQT_SIGNAL(signalPauseActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotPauseActivated()) ); + connect(tray, TQT_SIGNAL(signalNextActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotNextSentenceActivated()) ); + connect(tray, TQT_SIGNAL(signalPrevActivated()), TQT_TQOBJECT(this), TQT_SLOT(slotPrevSentenceActivated()) ); tray->show(); tray->setEnabled(true); // create the FX plugin handler - m_fxpluginhandler = new FXPluginHandler(this, "fxpluginhandler", config); + m_fxpluginhandler = new FXPluginHandler(TQT_TQOBJECT(this), "fxpluginhandler", config); m_fxpluginhandler->searchPlugins(); // create object for effectstack @@ -141,61 +141,61 @@ KSayItApp::~KSayItApp() void KSayItApp::initActions() { // Standard-Actions - open = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection()); - save = KStdAction::save(this, TQT_SLOT(slotFileSave()), actionCollection()); - saveAs = KStdAction::saveAs(this, TQT_SLOT(slotFileSaveAs()), actionCollection()); - KStdAction::quit(this, TQT_SLOT(slotFileQuit()), actionCollection()); - KStdAction::close(this, TQT_SLOT(slotCloseMainWindow()), actionCollection()); - cut = KStdAction::cut(view, TQT_SLOT(slotCut()), actionCollection()); - copy = KStdAction::copy(view, TQT_SLOT(slotCopy()), actionCollection()); - paste = KStdAction::paste(view, TQT_SLOT(slotPaste()), actionCollection()); - preferences = KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actionCollection()); - KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection()); - KStdAction::configureToolbars(this, TQT_SLOT(slotConfigureToolbar()), actionCollection()); + open = KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(slotFileOpen()), actionCollection()); + save = KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(slotFileSave()), actionCollection()); + saveAs = KStdAction::saveAs(TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAs()), actionCollection()); + KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(slotFileQuit()), actionCollection()); + KStdAction::close(TQT_TQOBJECT(this), TQT_SLOT(slotCloseMainWindow()), actionCollection()); + cut = KStdAction::cut(TQT_TQOBJECT(view), TQT_SLOT(slotCut()), actionCollection()); + copy = KStdAction::copy(TQT_TQOBJECT(view), TQT_SLOT(slotCopy()), actionCollection()); + paste = KStdAction::paste(TQT_TQOBJECT(view), TQT_SLOT(slotPaste()), actionCollection()); + preferences = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection()); + KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotEditKeys()), actionCollection()); + KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(slotConfigureToolbar()), actionCollection()); KStdAction::showToolbar("mainToolBar", actionCollection()); - statusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(slotToggleStatusBar()), actionCollection()); + statusBarAction = KStdAction::showStatusbar(TQT_TQOBJECT(this), TQT_SLOT(slotToggleStatusBar()), actionCollection()); // User defined actions say = new KAction (i18n("Say"), - Qt::Key_F9, - this, TQT_SLOT (slotSayText()), + TQt::Key_F9, + TQT_TQOBJECT(this), TQT_SLOT (slotSayText()), actionCollection(), "say_it"); pause = new KAction (i18n("Pause"), - Qt::Key_Pause, - this, TQT_SLOT (slotPauseActivated()), + TQt::Key_Pause, + TQT_TQOBJECT(this), TQT_SLOT (slotPauseActivated()), actionCollection(), "pause"); shutup = new KAction (i18n("Shut Up"), - Qt::Key_F10, - this, TQT_SLOT (slotStopActivated()), + TQt::Key_F10, + TQT_TQOBJECT(this), TQT_SLOT (slotStopActivated()), actionCollection(), "shut_up"); next_sentence = new KAction (i18n("Next Sentence"), - Qt::Key_Next, - this, TQT_SLOT (slotNextSentenceActivated()), + TQt::Key_Next, + TQT_TQOBJECT(this), TQT_SLOT (slotNextSentenceActivated()), actionCollection(), "next_sentence"); prev_sentence = new KAction (i18n("Previous Sentence"), - Qt::Key_Prior, - this, TQT_SLOT(slotPrevSentenceActivated()), + TQt::Key_Prior, + TQT_TQOBJECT(this), TQT_SLOT(slotPrevSentenceActivated()), actionCollection(), "prev_sentence"); clear = new KAction (i18n("Clear"), - Qt::Key_F12, - this, TQT_SLOT(slotClear()), + TQt::Key_F12, + TQT_TQOBJECT(this), TQT_SLOT(slotClear()), actionCollection(), "clear"); edit = new KToggleAction( i18n("Edit Text"), 0, - this, TQT_SLOT(slotEditToggled()), + TQT_TQOBJECT(this), TQT_SLOT(slotEditToggled()), actionCollection(), "edittext"); @@ -293,7 +293,7 @@ void KSayItApp::slotChangeBookmarkFilename(const TQString &newname) // copy old bookmarkfile to new file if ( m_currentBookmarkFile != newbkFile ){ if ( TQFile::exists(m_currentBookmarkFile) ){ - TQString command = TQString("cp %1 %2").arg(m_currentBookmarkFile).arg(newbkFile); + TQString command = TQString("cp %1 %2").tqarg(m_currentBookmarkFile).tqarg(newbkFile); system( command.ascii() ); } // install new BookmarkHandler based on the new file @@ -314,7 +314,7 @@ void KSayItApp::initStatusBar() { // STATUSBAR statusBar()->insertItem(i18n("Ready."), ID_STATUS_MSG, 1); - statusBar()->setItemAlignment(ID_STATUS_MSG, Qt::AlignLeft); + statusBar()->setItemAlignment(ID_STATUS_MSG, TQt::AlignLeft); } @@ -322,17 +322,17 @@ void KSayItApp::initView() { // create the main widget view = new KSayItViewImpl(this); - view->setMinimumSize(view->sizeHint()); + view->setMinimumSize(view->tqsizeHint()); setCentralWidget(view); // connections connect( view, TQT_SIGNAL(signalEnableCopyCut(bool)), - this, TQT_SLOT(slotEnableCopyCut(bool))); - connect( view, TQT_SIGNAL(signalShowStatus(const TQString &)), - this, TQT_SLOT(slotStatusMsg(const TQString &))); + TQT_TQOBJECT(this), TQT_SLOT(slotEnableCopyCut(bool))); + connect( view, TQT_SIGNAL(signalShowtqStatus(const TQString &)), + TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); connect( view, TQT_SIGNAL(signalSetCaption(const TQString &)), - this, TQT_SLOT(slotSetCaption(const TQString &))); + TQT_TQOBJECT(this), TQT_SLOT(slotSetCaption(const TQString &))); connect( view, TQT_SIGNAL(signalTextChanged(bool)), - this, TQT_SLOT(slotTextChanged(bool)) ); + TQT_TQOBJECT(this), TQT_SLOT(slotTextChanged(bool)) ); // DockWindow TQDockWindow *docview = new TQDockWindow(TQDockWindow::InDock, this, "docview"); @@ -341,25 +341,25 @@ void KSayItApp::initView() // treeview->clear(); docview->setWidget(treeview); docview->setResizeEnabled(true); - this->setDockEnabled(docview, Qt::DockTop, false); - this->setDockEnabled(docview, Qt::DockBottom, false); - this->moveDockWindow(docview, Qt::DockLeft); + this->setDockEnabled(docview, TQt::DockTop, false); + this->setDockEnabled(docview, TQt::DockBottom, false); + this->moveDockWindow(docview, TQt::DockLeft); connect( treeview, TQT_SIGNAL(signalContentChanged(const TQString&)), - this, TQT_SLOT(slotTreeViewChanged(const TQString&)) ); + TQT_TQOBJECT(this), TQT_SLOT(slotTreeViewChanged(const TQString&)) ); connect( treeview, TQT_SIGNAL(signalSetText(const TQString&)), - this, TQT_SLOT(slotSetText(const TQString&)) ); + TQT_TQOBJECT(this), TQT_SLOT(slotSetText(const TQString&)) ); connect( treeview, TQT_SIGNAL(signalAllNodesProcessed()), - this, TQT_SLOT(slotSayNode()) ); + TQT_TQOBJECT(this), TQT_SLOT(slotSayNode()) ); connect( treeview, TQT_SIGNAL(signalEnableTextedit(bool)), - this, TQT_SLOT(slotEnableTextedit(bool)) ); + TQT_TQOBJECT(this), TQT_SLOT(slotEnableTextedit(bool)) ); connect( treeview, TQT_SIGNAL(signalNotifyBookmarkManager(const TQString&, const TQString&)), - this, TQT_SLOT(slotNotifyBookmarkHandler(const TQString&, const TQString&)) ); + TQT_TQOBJECT(this), TQT_SLOT(slotNotifyBookmarkHandler(const TQString&, const TQString&)) ); connect( treeview, TQT_SIGNAL(signalSetBookmarkFilename(const TQString&)), - this, TQT_SLOT(slotSetBookmarkFilename(const TQString&)) ); + TQT_TQOBJECT(this), TQT_SLOT(slotSetBookmarkFilename(const TQString&)) ); connect( treeview, TQT_SIGNAL(signalChangeBookmarkFilename(const TQString&)), - this, TQT_SLOT(slotChangeBookmarkFilename(const TQString&)) ); + TQT_TQOBJECT(this), TQT_SLOT(slotChangeBookmarkFilename(const TQString&)) ); connect( treeview, TQT_SIGNAL(signalDeleteBookmark(const TQString&, const TQString&)), - this, TQT_SLOT(slotDeleteBookmark(const TQString&, const TQString&)) ); + TQT_TQOBJECT(this), TQT_SLOT(slotDeleteBookmark(const TQString&, const TQString&)) ); } @@ -473,7 +473,7 @@ void KSayItApp::slotFileOpen() // open filerequester TQString fn; TQString usershome( getenv("HOME") ); - KURL url = KFileDialog::getOpenURL(usershome, TQString::null, this, i18n("File to Speak") ); + KURL url = KFileDialog::getOpenURL(usershome, TQString(), this, i18n("File to Speak") ); try{ if ( !url.isEmpty() ){ resetView(); @@ -549,7 +549,7 @@ void KSayItApp::slotEditKeys() void KSayItApp::slotFileQuit() { slotStatusMsg(i18n("Exiting...")); - int really = KMessageBox::questionYesNo( this, i18n("Do you really want to quit?"), TQString::null, KStdGuiItem::quit(), KStdGuiItem::cancel() ); + int really = KMessageBox::questionYesNo( this, i18n("Do you really want to quit?"), TQString(), KStdGuiItem::quit(), KStdGuiItem::cancel() ); if (really == KMessageBox::Yes){ slotSaveOptions(); kapp->quit(); @@ -618,7 +618,7 @@ void KSayItApp::slotClipboardChanged() return; } - if ( cb->data(QClipboard::Clipboard)->provides("text/plain") ){ + if ( cb->data(TQClipboard::Clipboard)->provides("text/plain") ){ tray->changeState( StateWAIT::Instance() ); paste->setEnabled(true); } else { @@ -811,12 +811,12 @@ void KSayItApp::setActions(int actions) { // ACTIONS::PLAY | ACTIONS::STOP | ACTIONS::PAUSE | ACTIONS::FFWD | ACTIONS::FREV; - // Get the mask of supported actions from the plugin. - int mask = m_kttslib->getActions(); - kdDebug(100200) << TQString("KSayItApp:PSA: %1").arg(mask, 0, 2) << endl; + // 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; // disable actions not supported by the plugin - int ma = actions & mask; + int ma = actions & tqmask; if (ma & ACTIONS::PLAY){ say->setEnabled(true); diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h index fc8fef9..bf1e672 100644 --- a/ksayit/src/ksayit.h +++ b/ksayit/src/ksayit.h @@ -24,7 +24,7 @@ using namespace std; -// include files for Qt +// include files for TQt #include <tqstringlist.h> #include <tqclipboard.h> @@ -68,12 +68,13 @@ class KSayItBookmarkHandler; class KSayItApp : public KMainWindow, public DCOPObject { Q_OBJECT +// TQ_OBJECT K_DCOP public: /** construtor of KSayItApp, calls all init functions to create the application. */ - KSayItApp(TQWidget* parent=0, const char* name=0, WFlags f=0, + KSayItApp(TQWidget* tqparent=0, const char* name=0, WFlags f=0, const TQCString &objID=0); ~KSayItApp(); @@ -114,7 +115,7 @@ private slots: */ void slotTreeViewChanged(const TQString &str); - /** save general Options like all bar positions and status as well as the geometry to + /** save general Options like all bar positions and status as well as the tqgeometry to * the configuration file. */ void slotSaveOptions(); @@ -265,7 +266,7 @@ public: * Selects the item with the given ID in the TreeView. * \param ID The ID of the item to select. * \param title The title of the bookmark. - * \returns <tt>TQString::null</tt>, if the operation was successfull, + * \returns <tt>TQString()</tt>, if the operation was successfull, * an error message, if the ID was not found. */ TQString setItemByBookmark( const TQString &ID, const TQString &title ); @@ -315,7 +316,7 @@ private: // Methods * \p ksayit/ksayit_bookmarks/. * \param filename The name of the bookmark file. * \returns The absolute pathname of the given bookmark file. - * Returns \p TQString::null if the operation was not successfull. + * Returns \p TQString() if the operation was not successfull. */ TQString getBookmarkDir(const TQString &filename); @@ -349,7 +350,7 @@ private: KActionMenu *bookmarkmenu; // Misc stuff - QClipboard *cb; + TQClipboard *cb; TQString clip; KTTSDLib *m_kttslib; FXPluginHandler *m_fxpluginhandler; diff --git a/ksayit/src/ksayit_fxplugin.h b/ksayit/src/ksayit_fxplugin.h index 852c522..211ca36 100644 --- a/ksayit/src/ksayit_fxplugin.h +++ b/ksayit/src/ksayit_fxplugin.h @@ -30,14 +30,15 @@ using namespace Arts; * derived from FXPlugin, include 'ksayit_fxplugin.h' and reimplement all the * pure virtual functions provided herein. * *Appl is a pointer to the main application as delivered by \p KApplication::kApplication(). - * It can be used for any reason i.e. to install a Qt translator.\n + * It can be used for any reason i.e. to install a TQt translator.\n \author Robert Vogl */ -class FXPlugin : public QObject +class FXPlugin : public TQObject { // Q_OBJECT + TQ_OBJECT public: - FXPlugin(TQObject *parent=0, const char* name=0){}; + FXPlugin(TQObject *tqparent=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 e0f8d31..bb3e9f9 100644 --- a/ksayit/src/ksayit_ttsplugin.h +++ b/ksayit/src/ksayit_ttsplugin.h @@ -37,7 +37,7 @@ * \p createPlugin() returns a pointer to an instance of your class. * The Plugin Handler of KSayIt calls this function with a parameter pointing * to the main application instance, as delivered by \p KApplication::kApplication(). - * This pointer can be used for any reason i.e. to install a Qt translator.\n + * This pointer can be used for any reason i.e. to install a TQt translator.\n * An instance of your class should be deleted by use of \p destroyPlugin().\n * Example: \code @@ -54,7 +54,7 @@ } }; \endcode - * KSayIt expects two Qt-signals from the plugin:\n + * KSayIt expects two TQt-signals from the plugin:\n * \p signalPluginFinished() must be emitted when the plugin is finished, * i.e. a task to speak text has been finished.\n * \p signalPluginFailed() is optional and shall emitted if the processing @@ -62,10 +62,10 @@ \author Robert Vogl */ -class TTSPlugin : public QObject +class TTSPlugin : public TQObject { protected: - TTSPlugin(TQObject *parent, const char *name) : TQObject(parent, name){}; + TTSPlugin(TQObject *tqparent, const char *name) : TQObject(tqparent, name){}; public: /** Returns the name of the plugin. This name is the unique identifier @@ -109,7 +109,7 @@ public: * In this case, KSayIt uses a built-in audio player to play back * the file via aRts.\n * If this plugin provides its own audio output mechanisms, then return - * \p TQString::null.\n + * \p TQString().\n * The TTS processing shall be implemented non-blocking, i.e. this function has * to return a valid string as soon as possible, before the typically time * consuming TTS processing starts. The synchronization with KSayIt shall diff --git a/ksayit/src/ksayitbookmarkhandler.cpp b/ksayit/src/ksayitbookmarkhandler.cpp index 7a45247..8e838d5 100644 --- a/ksayit/src/ksayitbookmarkhandler.cpp +++ b/ksayit/src/ksayitbookmarkhandler.cpp @@ -10,7 +10,7 @@ // // -// Qt include +// TQt include #include <tqregexp.h> // KDE includes @@ -23,11 +23,11 @@ #include "ksayitbookmarkhandler.h" #include "ksayit.h" -KSayItBookmarkHandler::KSayItBookmarkHandler(KBookmarkManager *bkManager, KSayItApp* parent) - : KBookmarkOwner(), m_bkManager(bkManager), m_parent(parent) +KSayItBookmarkHandler::KSayItBookmarkHandler(KBookmarkManager *bkManager, KSayItApp* tqparent) + : KBookmarkOwner(), m_bkManager(bkManager), m_parent(tqparent) { - m_ID = TQString::null; - m_title = TQString::null; + m_ID = TQString(); + m_title = TQString(); } KSayItBookmarkHandler::~KSayItBookmarkHandler() @@ -49,10 +49,10 @@ void KSayItBookmarkHandler::openBookmarkURL(const TQString &url) kdDebug(100200) << "KSayItBookmarkHandler::openBookmarkURL(" << url << ")" << endl; TQString l_url = url; - TQString title = TQString::null; + TQString title = TQString(); TQString type = l_url.section( "://", 0, 0 ); TQString ID = l_url.section( TQRegExp("/+"), 1, 1 ); - TQString err = TQString::null; + TQString err = TQString(); // Some checks if ( type != "ksayit" ){ @@ -71,7 +71,7 @@ void KSayItBookmarkHandler::openBookmarkURL(const TQString &url) title = bookmark.text(); } - TQString result = TQString::null; + TQString result = TQString(); result = m_parent->setItemByBookmark( ID, title ); if ( !result.isNull() ){ KMessageBox::sorry( 0, result, i18n("Bookmark not found") ); @@ -228,7 +228,7 @@ void KSayItBookmarkHandler::traverseBookmarks(KBookmarkGroup bkGroup) // // Modifications on URL/Title END - bkNew = bkGroup.addBookmark( m_bkManager, title, url, TQString::null, false ); + bkNew = bkGroup.addBookmark( m_bkManager, title, url, TQString(), false ); bkGroup.moveItem( bkNew, bkPrev ); bkGroup.deleteBookmark( bk ); } diff --git a/ksayit/src/ksayitbookmarkhandler.h b/ksayit/src/ksayitbookmarkhandler.h index 018ea39..31be84c 100644 --- a/ksayit/src/ksayitbookmarkhandler.h +++ b/ksayit/src/ksayitbookmarkhandler.h @@ -12,7 +12,7 @@ #ifndef KSAYITBOOKMARKHANDLER_H #define KSAYITBOOKMARKHANDLER_H -// Qt includes +// TQt includes #include <tqstring.h> // KDE includes @@ -31,7 +31,7 @@ class KSayItApp; class KSayItBookmarkHandler : public KBookmarkOwner { public: - KSayItBookmarkHandler(KBookmarkManager *bkManager=0, KSayItApp* parent=0); + KSayItBookmarkHandler(KBookmarkManager *bkManager=0, KSayItApp* tqparent=0); virtual ~KSayItBookmarkHandler(); public: diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp index e2001cd..e7054a2 100644 --- a/ksayit/src/ksayitsystemtray.cpp +++ b/ksayit/src/ksayitsystemtray.cpp @@ -26,8 +26,8 @@ // App specific includes #include "ksayitsystemtray.h" -KSayItSystemTray::KSayItSystemTray(TQWidget *parent, const char *name) - : KSystemTray(parent,name) +KSayItSystemTray::KSayItSystemTray(TQWidget *tqparent, const char *name) + : KSystemTray(tqparent,name) { initActions(); changeState( StateCLIPEMPTY::Instance() ); @@ -46,7 +46,7 @@ void KSayItSystemTray::initActions() menu = this->contextMenu(); help = new KHelpMenu(this, kapp->aboutData(), false, actionCollection()); // Standard actions - settings = KStdAction::preferences(this, TQT_SLOT(slotPreferences()), actionCollection()); + settings = KStdAction::preferences(TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()), actionCollection()); help_about = KStdAction::aboutApp(help, TQT_SLOT(aboutApplication()), actionCollection()); help_kde = KStdAction::aboutKDE(help, TQT_SLOT(aboutKDE()), actionCollection()); @@ -54,28 +54,28 @@ void KSayItSystemTray::initActions() say = new KAction(i18n("Say"), "player_play", 0, - this, TQT_SLOT (slotSayActivated()), + TQT_TQOBJECT(this), TQT_SLOT (slotSayActivated()), actionCollection(), "say_it"); shutup = new KAction(i18n("Shut Up"), "player_stop", 0, - this, TQT_SLOT (slotStopActivated()), + TQT_TQOBJECT(this), TQT_SLOT (slotStopActivated()), actionCollection(), "shut_up"); pause = new KAction (i18n("Pause"), "player_pause", 0, - this, TQT_SLOT (slotPauseActivated()), + TQT_TQOBJECT(this), TQT_SLOT (slotPauseActivated()), actionCollection(), "pause"); next_sentence = new KAction (i18n("Next Sentence"), "2rightarrow", 0, - this, TQT_SLOT (slotNextSentenceActivated()), + TQT_TQOBJECT(this), TQT_SLOT (slotNextSentenceActivated()), actionCollection(), "next_sentence"); @@ -83,7 +83,7 @@ void KSayItSystemTray::initActions() prev_sentence = new KAction (i18n("Previous Sentence"), "2leftarrow", 0, - this, TQT_SLOT(slotPrevSentenceActivated()), + TQT_TQOBJECT(this), TQT_SLOT(slotPrevSentenceActivated()), actionCollection(), "prev_sentence"); @@ -253,7 +253,7 @@ void StateWAIT::setContext(KSayItSystemTray *caller) void StateWAIT::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==LeftButton){ // left Mouse-button pressed + if (e->button()==Qt::LeftButton){ // left Mouse-button pressed TQWidget::mousePressEvent(e); // do nothing (see mouseReleaseEvent) } else { mousePressEventCall(caller, e); // normal mouse-handling @@ -262,7 +262,7 @@ void StateWAIT::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) void StateWAIT::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==LeftButton){ // left Mouse-button released + if (e->button()==Qt::LeftButton){ // left Mouse-button released say(caller); } else { mouseReleaseEventCall(caller, e); // normal mouse-handling @@ -294,7 +294,7 @@ void StateSAY::setContext(KSayItSystemTray *caller) void StateSAY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==LeftButton){ // left Mouse-button pressed + if (e->button()==Qt::LeftButton){ // left Mouse-button pressed TQWidget::mousePressEvent(e); // do nothing (see mouseReleaseEvent) } else { mousePressEventCall(caller, e); // normal mouse-handling @@ -303,7 +303,7 @@ void StateSAY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) void StateSAY::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==LeftButton){ // left Mouse-button released + if (e->button()==Qt::LeftButton){ // left Mouse-button released TQWidget::mouseReleaseEvent(e); // do nothing (see mouseReleaseEvent) } else { mouseReleaseEventCall(caller, e); // normal mouse-handling @@ -336,7 +336,7 @@ void StateCLIPEMPTY::setContext(KSayItSystemTray *caller) void StateCLIPEMPTY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==LeftButton){ // left Mouse-button pressed + if (e->button()==Qt::LeftButton){ // left Mouse-button pressed TQWidget::mousePressEvent(e); // do nothing (see mouseReleaseEvent) } else { mousePressEventCall(caller, e); // normal mouse-handling @@ -345,7 +345,7 @@ void StateCLIPEMPTY::mousePressEvent(KSayItSystemTray *caller, TQMouseEvent *e) void StateCLIPEMPTY::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e) { - if (e->button()==LeftButton){ // left Mouse-button released + if (e->button()==Qt::LeftButton){ // left Mouse-button released TQWidget::mouseReleaseEvent(e); // do nothing (see mouseReleaseEvent) } else { mouseReleaseEventCall(caller, e); // normal mouse-handling diff --git a/ksayit/src/ksayitsystemtray.h b/ksayit/src/ksayitsystemtray.h index 90b15fb..cdeca47 100644 --- a/ksayit/src/ksayitsystemtray.h +++ b/ksayit/src/ksayitsystemtray.h @@ -39,11 +39,12 @@ class State; */ class KSayItSystemTray : public KSystemTray { Q_OBJECT + TQ_OBJECT friend class State; public: - KSayItSystemTray(TQWidget *parent=0, const char *name=0); + KSayItSystemTray(TQWidget *tqparent=0, const char *name=0); ~KSayItSystemTray(); signals: @@ -149,6 +150,7 @@ private: class State : public KSystemTray { Q_OBJECT + TQ_OBJECT public: State(); ~State(); diff --git a/ksayit/src/ksayitviewimpl.cpp b/ksayit/src/ksayitviewimpl.cpp index dfda154..07c5cdf 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 *parent, const char *name ) : KSayItView(parent,name) { +KSayItViewImpl::KSayItViewImpl(TQWidget *tqparent, const char *name ) : KSayItView(tqparent,name) { // some presets @@ -51,9 +51,9 @@ void KSayItViewImpl::enableTextedit( bool enable ) { // if enable==true, we are in Edit Mode => RTF-Mode off. if ( enable ){ - TextEdit->setTextFormat( Qt::PlainText); + TextEdit->setTextFormat( TQt::PlainText); } else { - TextEdit->setTextFormat( Qt::RichText); + TextEdit->setTextFormat( TQt::RichText); } TextEdit->setReadOnly( !enable ); } diff --git a/ksayit/src/ksayitviewimpl.h b/ksayit/src/ksayitviewimpl.h index eb288e7..fab7e49 100644 --- a/ksayit/src/ksayitviewimpl.h +++ b/ksayit/src/ksayitviewimpl.h @@ -33,14 +33,15 @@ class KSayItViewImpl : public KSayItView { Q_OBJECT + TQ_OBJECT public: - KSayItViewImpl(TQWidget *parent=0, const char *name=0); + KSayItViewImpl(TQWidget *tqparent=0, const char *name=0); ~KSayItViewImpl(); signals: void signalSetCaption(const TQString &caption); - void signalShowStatus(const TQString &status); + void signalShowtqStatus(const TQString &status); void signalEnableCopyCut(bool enable); /** Emitted when the text in the TextEditor view cahnges. diff --git a/ksayit/src/parasaxparser.cpp b/ksayit/src/parasaxparser.cpp index 9a61e0a..a296e22 100644 --- a/ksayit/src/parasaxparser.cpp +++ b/ksayit/src/parasaxparser.cpp @@ -12,7 +12,7 @@ // #include <iostream> // cout // using namespace std; -// Qt includes +// TQt includes // KDE includes #include <kdebug.h> @@ -30,8 +30,8 @@ ParaSaxParser::ParaSaxParser() m_reader->setEntityResolver(m_handler); m_reader->setDeclHandler(m_handler); - m_XmlInputHeader = TQString::null; - m_XmlInputBody = TQString::null; + m_XmlInputHeader = TQString(); + m_XmlInputBody = TQString(); } ParaSaxParser::~ParaSaxParser() diff --git a/ksayit/src/parasaxparser.h b/ksayit/src/parasaxparser.h index 6f46156..3b9c72c 100644 --- a/ksayit/src/parasaxparser.h +++ b/ksayit/src/parasaxparser.h @@ -12,7 +12,7 @@ #ifndef PARASAXPARSER_H #define PARASAXPARSER_H -// Qt includes +// TQt includes #include <tqxml.h> #include <tqstring.h> diff --git a/ksayit/src/saxhandler.cpp b/ksayit/src/saxhandler.cpp index 9f6354c..7e2d6aa 100644 --- a/ksayit/src/saxhandler.cpp +++ b/ksayit/src/saxhandler.cpp @@ -23,7 +23,7 @@ SaxHandler::SaxHandler() : TQXmlDefaultHandler() { - m_output = TQString::null; + m_output = TQString(); m_rtf = true; m_tagmap["action"] = "B"; m_tagmap["application"] = "B"; @@ -127,7 +127,7 @@ bool SaxHandler::characters(const TQString & ch) bool SaxHandler::fatalError(const TQXmlParseException &exc) { TQString err = i18n("Fatal error while parsing XML-Paragraph:\n"); - err += i18n("%1, Line: %2").arg(exc.message()).arg(exc.lineNumber()); + err += i18n("%1, Line: %2").tqarg(exc.message()).tqarg(exc.lineNumber()); KMessageBox::error(0, err, i18n("Fatal error") ); return false; } @@ -160,7 +160,7 @@ bool SaxHandler::internalEntityDecl(const TQString & name, bool SaxHandler::skippedEntity(const TQString &name) { - TQString warn = i18n("Unresolved entity found: %1.\n").arg(name); + TQString warn = i18n("Unresolved entity found: %1.\n").tqarg(name); warn += i18n("KSayIt does not support DocBook files with external entities. "); warn += i18n("Parsing can continue, but the resulting text will contain gaps."); @@ -181,7 +181,7 @@ void SaxHandler::getData( TQString &data ) const void SaxHandler::reset() { - m_output = TQString::null; + m_output = TQString(); } diff --git a/ksayit/src/saxhandler.h b/ksayit/src/saxhandler.h index 4e611b7..397ecef 100644 --- a/ksayit/src/saxhandler.h +++ b/ksayit/src/saxhandler.h @@ -1,7 +1,7 @@ // // C++ Interface: saxhandler // -// Description: Qt SAX2-Handler +// Description: TQt SAX2-Handler // // // Author: Robert Vogl <voglrobe@web.de>, (C) 2005 @@ -16,7 +16,7 @@ #include <map> using namespace std; -// Qt includes +// TQt includes #include <tqxml.h> #include <tqstring.h> @@ -26,7 +26,7 @@ typedef map<TQString, TQString> TagMapT; /** @author Robert Vogl */ -class SaxHandler : public QXmlDefaultHandler +class SaxHandler : public TQXmlDefaultHandler { public: SaxHandler(); diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp index d8df70a..50e4e1c 100644 --- a/ksayit/src/voicesetupdlg.cpp +++ b/ksayit/src/voicesetupdlg.cpp @@ -39,12 +39,12 @@ #include "fxpluginhandler.h" #include "kttsdlib.h" -VoiceSetupDlg::VoiceSetupDlg(TQWidget *parent, const char *name, const TQString &caption, +VoiceSetupDlg::VoiceSetupDlg(TQWidget *tqparent, const char *name, const TQString &caption, bool modal, KConfig *config, FXPluginHandler *fxpluginhandler, KTTSDLib *ttslib) - : KDialogBase(IconList, caption, Ok|Cancel, Ok, parent, name, modal, true), + : KDialogBase(IconList, caption, Ok|Cancel, Ok, tqparent, name, modal, true), m_config(config), m_fxpluginhandler(fxpluginhandler), m_kttslib(ttslib) @@ -88,7 +88,7 @@ void VoiceSetupDlg::initFXPage() connect( this, TQT_SIGNAL(signalReloadFX()), fxDialog, TQT_SLOT(slotReload()) ); // Disable/enable FX-Setup depending on TTS-libs capability - int status = m_kttslib->getStatus() & TTS::AUDIOFILE; + int status = m_kttslib->gettqStatus() & TTS::AUDIOFILE; if ( status ){ m_fxPage->setEnabled(true); } else { @@ -105,7 +105,7 @@ void VoiceSetupDlg::slotPageChanged(TQWidget *page) if ( page != m_fxPage ) return; - int status = m_kttslib->getStatus() & TTS::AUDIOFILE; + int status = m_kttslib->gettqStatus() & TTS::AUDIOFILE; if ( status ){ m_fxPage->setEnabled(true); } else { @@ -120,7 +120,7 @@ void VoiceSetupDlg::slotOk() { kdDebug(100200) << "+++ entering VoiceSetupDlg::slotOK()" << endl; - int status = m_kttslib->getStatus(); + int status = m_kttslib->gettqStatus(); if ( (status & TTS::AUDIOFILE) == 0 ){ emit signalRemoveAllFX(); } diff --git a/ksayit/src/voicesetupdlg.h b/ksayit/src/voicesetupdlg.h index c9063e4..10cc42e 100644 --- a/ksayit/src/voicesetupdlg.h +++ b/ksayit/src/voicesetupdlg.h @@ -33,9 +33,10 @@ class KTTSDLib; */ class VoiceSetupDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - VoiceSetupDlg(TQWidget *parent=0, const char *name=0, const TQString &caption=NULL, + VoiceSetupDlg(TQWidget *tqparent=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 47837fb..65017b7 100644 --- a/kttsd/app-plugins/kate/katekttsd.cpp +++ b/kttsd/app-plugins/kate/katekttsd.cpp @@ -17,7 +17,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqmessagebox.h> #include <dcopclient.h> #include <tqtimer.h> @@ -38,8 +38,8 @@ K_EXPORT_COMPONENT_FACTORY( ktexteditor_kttsd, KGenericFactory<KateKttsdPlugin>( "ktexteditor_kttsd" ) ) -KateKttsdPlugin::KateKttsdPlugin( TQObject *parent, const char* name, const TQStringList& ) - : KTextEditor::Plugin ( (KTextEditor::Document*) parent, name ) +KateKttsdPlugin::KateKttsdPlugin( TQObject *tqparent, const char* name, const TQStringList& ) + : KTextEditor::Plugin ( (KTextEditor::Document*) tqparent, name ) { } @@ -80,7 +80,7 @@ KateKttsdPluginView::KateKttsdPluginView( KTextEditor::View *view, const char *n void KateKttsdPluginView::slotReadOut() { - KTextEditor::View *v = (KTextEditor::View*)parent(); + KTextEditor::View *v = (KTextEditor::View*)tqparent(); 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 c30f3cf..cfcc750 100644 --- a/kttsd/app-plugins/kate/katekttsd.h +++ b/kttsd/app-plugins/kate/katekttsd.h @@ -28,9 +28,10 @@ class KateKttsdPlugin : public KTextEditor::Plugin, public KTextEditor::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - KateKttsdPlugin( TQObject *parent = 0, + KateKttsdPlugin( TQObject *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList() ); virtual ~KateKttsdPlugin(); @@ -45,6 +46,7 @@ class KateKttsdPlugin : public KTextEditor::Plugin, public KTextEditor::PluginVi class KateKttsdPluginView : public TQObject, public KXMLGUIClient { Q_OBJECT + TQ_OBJECT public: KateKttsdPluginView( KTextEditor::View *view, const char *name=0 ); diff --git a/kttsd/compat/interfaces/kspeech/kspeech.h b/kttsd/compat/interfaces/kspeech/kspeech.h index d321528..39ca74c 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 *parent, const char *name) : - KParts::ReadOnlyPart(parent, name), + MyPart::MyPart(TQWidget *tqparent, const char *name) : + KParts::ReadOnlyPart(tqparent, name), DCOPStub("kttsd", "KSpeech") { @endverbatim * @@ -293,8 +293,8 @@ * receiving object. * @verbatim - MyPart::MyPart(TQWidget *parent, const char *name) : - KParts::ReadOnlyPart(parent, name), + MyPart::MyPart(TQWidget *tqparent, const char *name) : + KParts::ReadOnlyPart(tqparent, name), DCOPObject("mypart_kspeechsink") { @endverbatim * @@ -441,7 +441,7 @@ * a Spanish synthesizer would likely be unintelligible). So the language * attribute is said to have "priority". * If an application does not specify a language attribute, a default one will be assumed. - * The rest of the attributes are said to be "preferred". If %KTTSD cannot find + * The rest of the attributes are said to be "preferred". If %KTTSD cannot tqfind * a talker with the exact preferred attributes requested, the closest matching * talker will likely still be understandable. * @@ -751,11 +751,11 @@ class KSpeech : virtual public DCOPObject { * with a single space, and then replaces the sentence delimiters using * the following statement: @verbatim - TQString::replace(sentenceDelimiter, "\\1\t"); + TQString::tqreplace(sentenceDelimiter, "\\1\t"); @endverbatim * * which replaces all sentence delimiters with a tab, but - * preserving the first capture text (first parenthesis). In other + * preserving the first capture text (first tqparenthesis). In other * words, the sentence punctuation is preserved. * The tab is later used to separate the text into sentences. * diff --git a/kttsd/configure.in.in b/kttsd/configure.in.in index 4adcfb1..b833cfc 100644 --- a/kttsd/configure.in.in +++ b/kttsd/configure.in.in @@ -280,16 +280,7 @@ kdeversion_save_LIBS="$LIBS" LIBS="$LIBS $X_EXTRA_LIBS" CXXFLAGS="$CXXFLAGS $all_includes" -AC_COMPILE_IFELSE([ -#include <kdeversion.h> -#if ! ( KDE_IS_VERSION( 3, 4, 90 ) ) -#error KDE 3.4 -#endif -], - KTTS_ICONS_DIR="" -, - KTTS_ICONS_DIR="icons" -) +KTTS_ICONS_DIR="icons" CXXFLAGS="$kdeversion_save_CXXFLAGS" LIBS="$kdeversion_save_LIBS" diff --git a/kttsd/debian/man/kttsd.1 b/kttsd/debian/man/kttsd.1 index 379d7f0..4b8743b 100644 --- a/kttsd/debian/man/kttsd.1 +++ b/kttsd/debian/man/kttsd.1 @@ -62,8 +62,8 @@ Waits for a WM_NET compatible windowmanager .B --style <style> sets the application GUI style .TP -.B --geometry <geometry> -sets the client geometry of the main widget +.B --tqgeometry <tqgeometry> +sets the client tqgeometry of the main widget .TP .B --nofork Don't run in the background. @@ -131,7 +131,7 @@ set XIM server disable XIM .TP .B --reverse -mirrors the whole layout of widgets +mirrors the whole tqlayout of widgets .SS .SH SEE ALSO diff --git a/kttsd/debian/man/kttsmgr.1 b/kttsd/debian/man/kttsmgr.1 index 547ff14..c01468f 100644 --- a/kttsd/debian/man/kttsmgr.1 +++ b/kttsd/debian/man/kttsmgr.1 @@ -61,8 +61,8 @@ Waits for a WM_NET compatible windowmanager .B --style <style> sets the application GUI style .TP -.B --geometry <geometry> -sets the client geometry of the main widget +.B --tqgeometry <tqgeometry> +sets the client tqgeometry of the main widget .TP .B --nofork Don't run in the background. @@ -130,7 +130,7 @@ set XIM server disable XIM .TP .B --reverse -mirrors the whole layout of widgets +mirrors the whole tqlayout of widgets .SS .SH SEE ALSO diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp index f33d771..015bed0 100644 --- a/kttsd/filters/main.cpp +++ b/kttsd/filters/main.cpp @@ -123,9 +123,9 @@ int main(int argc, char *argv[]) TalkerCode* talkerCode = new TalkerCode( talker ); text = plugIn->convert( text, talkerCode, appId ); if ( args->isSet("break") ) - text.replace( "\t", "\\t" ); + text.tqreplace( "\t", "\\t" ); else - text.replace( "\t", "" ); + text.tqreplace( "\t", "" ); cout << text.latin1() << endl; delete config; delete plugIn; diff --git a/kttsd/filters/sbd/sbdconf.cpp b/kttsd/filters/sbd/sbdconf.cpp index 5244974..6beaba3 100644 --- a/kttsd/filters/sbd/sbdconf.cpp +++ b/kttsd/filters/sbd/sbdconf.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqfile.h> #include <tqfileinfo.h> #include <tqstring.h> @@ -56,17 +56,17 @@ /** * Constructor */ -SbdConf::SbdConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(parent, name) +SbdConf::SbdConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(tqparent, name) { // kdDebug() << "SbdConf::SbdConf: Running" << endl; // Create configuration widget. - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "SbdConfigWidgetLayout"); - layout->setAlignment (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new SbdConfWidget(this, "SbdConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // Determine if kdeutils Regular Expression Editor is installed. m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); @@ -156,7 +156,7 @@ void SbdConf::save(KConfig* config, const TQString& configGroup){ config->writeEntry("SentenceDelimiterRegExp", m_widget->reLineEdit->text() ); config->writeEntry("SentenceBoundary", m_widget->sbLineEdit->text() ); config->writeEntry("LanguageCodes", m_languageCodeList ); - config->writeEntry("AppID", m_widget->appIdLineEdit->text().replace(" ", "") ); + config->writeEntry("AppID", m_widget->appIdLineEdit->text().tqreplace(" ", "") ); } /** @@ -195,7 +195,7 @@ bool SbdConf::supportsMultiInstance() { return true; } TQString SbdConf::userPlugInName() { if ( m_widget->reLineEdit->text().isEmpty() ) - return TQString::null; + return TQString(); else return m_widget->nameLineEdit->text(); } @@ -257,7 +257,7 @@ void SbdConf::slotLanguageBrowseButton_clicked() if (!countryCode.isEmpty()) language += " (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; TQListViewItem* item = new KListViewItem(langLView, language, locale); - if (m_languageCodeList.contains(locale)) item->setSelected(true); + if (m_languageCodeList.tqcontains(locale)) item->setSelected(true); } // Sort by language. langLView->setSorting(0); @@ -276,7 +276,7 @@ void SbdConf::slotLanguageBrowseButton_clicked() dlg->setHelp("", "kttsd"); dlg->setInitialSize(TQSize(300, 500), false); int dlgResult = dlg->exec(); - languageCode = TQString::null; + languageCode = TQString(); if (dlgResult == TQDialog::Accepted) { m_languageCodeList.clear(); @@ -288,7 +288,7 @@ void SbdConf::slotLanguageBrowseButton_clicked() } } delete dlg; - // TODO: Also delete KListView and QHBox? + // TODO: Also delete KListView and TQHBox? if (dlgResult != TQDialog::Accepted) return; language = ""; for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx) @@ -331,11 +331,11 @@ void SbdConf::slotSaveButton_clicked() void SbdConf::slotClearButton_clicked() { - m_widget->nameLineEdit->setText( TQString::null ); - m_widget->reLineEdit->setText( TQString::null ); - m_widget->sbLineEdit->setText( TQString::null ); + m_widget->nameLineEdit->setText( TQString() ); + m_widget->reLineEdit->setText( TQString() ); + m_widget->sbLineEdit->setText( TQString() ); m_languageCodeList.clear(); - m_widget->languageLineEdit->setText( TQString::null ); - m_widget->appIdLineEdit->setText( TQString::null ); + m_widget->languageLineEdit->setText( TQString() ); + m_widget->appIdLineEdit->setText( TQString() ); configChanged(); } diff --git a/kttsd/filters/sbd/sbdconf.h b/kttsd/filters/sbd/sbdconf.h index eb1b817..f2610c4 100644 --- a/kttsd/filters/sbd/sbdconf.h +++ b/kttsd/filters/sbd/sbdconf.h @@ -24,7 +24,7 @@ #ifndef _SBDCONF_H_ #define _SBDCONF_H_ -// Qt includes. +// TQt includes. #include <tqwidget.h> // KDE includes. @@ -43,12 +43,13 @@ class EditReplacementWidget; class SbdConf : public KttsFilterConf { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - SbdConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); + SbdConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/sbd/sbdconfwidget.ui b/kttsd/filters/sbd/sbdconfwidget.ui index 17cd525..c094a52 100644 --- a/kttsd/filters/sbd/sbdconfwidget.ui +++ b/kttsd/filters/sbd/sbdconfwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SbdConfWidget</class> <author>Gary Cramblitt <garycramblitt@comcast.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SbdConfWidget</cstring> </property> @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -33,22 +33,22 @@ <string><b>WARNING: This filter is a key component of the KTTS system. Please read the KTTS Handbook before modifying these settings.</b></string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>nameLabel</cstring> </property> <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -72,22 +72,22 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>reLabel</cstring> </property> <property name="text"> <string>&Sentence boundary regular expression:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -116,22 +116,22 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout17_2</cstring> + <cstring>tqlayout17_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>sbLabel</cstring> </property> <property name="text"> <string>&Replacement sentence boundary:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -152,7 +152,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="4" column="0"> + <widget class="TQGroupBox" row="4" column="0"> <property name="name"> <cstring>applyGroupBox</cstring> </property> @@ -166,22 +166,22 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>languageLabel</cstring> </property> <property name="text"> <string>&Language is:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -192,14 +192,14 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>appIdLabel</cstring> </property> <property name="text"> - <string>Application &ID contains:</string> + <string>Application &ID tqcontains:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -211,17 +211,17 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -263,9 +263,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="5" column="0"> + <widget class="TQLayoutWidget" row="5" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -347,7 +347,7 @@ <tabstop>languageBrowseButton</tabstop> <tabstop>appIdLineEdit</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/filters/sbd/sbdproc.cpp b/kttsd/filters/sbd/sbdproc.cpp index 6117b11..6b0a1a4 100644 --- a/kttsd/filters/sbd/sbdproc.cpp +++ b/kttsd/filters/sbd/sbdproc.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqregexp.h> #include <tqdom.h> #include <tqapplication.h> @@ -41,8 +41,8 @@ /** * Constructor. */ -SbdThread::SbdThread( TQObject *parent, const char *name ) : - TQObject( parent, name ), +SbdThread::SbdThread( TQObject *tqparent, const char *name ) : + TQObject( tqparent, name ), TQThread() { } @@ -175,7 +175,7 @@ void SbdThread::pushSsmlElem( SsmlElemType et, const TQDomElement& elem ) // i.e., name="value". TQString SbdThread::makeAttr( const TQString& name, const TQString& value ) { - if ( value.isEmpty() ) return TQString::null; + if ( value.isEmpty() ) return TQString(); return " " + name + "=\"" + value + "\""; } @@ -277,8 +277,8 @@ TQString SbdThread::makeSentence( const TQString& text ) if ( !e.isEmpty() ) s += e; // Escape ampersands and less thans. TQString newText = text; - newText.replace(TQRegExp("&(?!amp;)"), "&"); - newText.replace(TQRegExp("<(?!lt;)"), "<"); + newText.tqreplace(TQRegExp("&(?!amp;)"), "&"); + newText.tqreplace(TQRegExp("<(?!lt;)"), "<"); s += newText; if ( !e.isEmpty() ) s += "</emphasis>"; if ( !p.isEmpty() ) s += "</prosody>"; @@ -289,7 +289,7 @@ TQString SbdThread::makeSentence( const TQString& text ) // Starts a sentence by returning a speak tag. TQString SbdThread::startSentence() { - if ( m_sentenceStarted ) return TQString::null; + if ( m_sentenceStarted ) return TQString(); TQString s; s += makeSsmlElem( etSpeak ); m_sentenceStarted = true; @@ -299,14 +299,14 @@ TQString SbdThread::startSentence() // Ends a sentence and appends a Tab. TQString SbdThread::endSentence() { - if ( !m_sentenceStarted ) return TQString::null; + if ( !m_sentenceStarted ) return TQString(); TQString s = "</speak>"; s += "\t"; m_sentenceStarted = false; return s; } -// Parses a node of the SSML tree and recursively parses its children. +// Parses a node of the SSML tree and recursively parses its tqchildren. // Returns the filtered text with each sentence a complete ssml tree. TQString SbdThread::parseSsmlNode( TQDomNode& n, const TQString& re ) { @@ -351,7 +351,7 @@ TQString SbdThread::parseSsmlNode( TQDomNode& n, const TQString& re ) case TQDomNode::TextNode: { // = 3 TQString s = parsePlainText( n.toText().data(), re ); // TQString d = s; - // d.replace("\t", "\\t"); + // d.tqreplace("\t", "\\t"); // kdDebug() << "SbdThread::parseSsmlNode: parsedPlainText = [" << d << "]" << endl; TQStringList sentenceList = TQStringList::split( '\t', s, false ); int lastNdx = sentenceList.count() - 1; @@ -441,7 +441,7 @@ TQString SbdThread::parseSsml( const TQString& inputText, const TQString& re ) // This flag is used to close out a previous sentence. m_sentenceStarted = false; - // Get the root element (speak) and recursively process its children. + // Get the root element (speak) and recursively process its tqchildren. TQDomElement docElem = doc.documentElement(); TQDomNode n = docElem.firstChild(); TQString ssml = parseSsmlNode( docElem, re ); @@ -457,13 +457,13 @@ TQString SbdThread::parseCode( const TQString& inputText ) { TQString temp = inputText; // Replace newlines with tabs. - temp.replace("\n","\t"); + temp.tqreplace("\n","\t"); // Remove leading spaces. - temp.replace(TQRegExp("\\t +"), "\t"); + temp.tqreplace(TQRegExp("\\t +"), "\t"); // Remove trailing spaces. - temp.replace(TQRegExp(" +\\t"), "\t"); + temp.tqreplace(TQRegExp(" +\\t"), "\t"); // Remove blank lines. - temp.replace(TQRegExp("\t\t+"),"\t"); + temp.tqreplace(TQRegExp("\t\t+"),"\t"); return temp; } @@ -474,16 +474,16 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r TQRegExp sentenceDelimiter = TQRegExp( re ); TQString temp = inputText; // Replace sentence delimiters with tab. - temp.replace(sentenceDelimiter, m_configuredSentenceBoundary); + temp.tqreplace(sentenceDelimiter, m_configuredSentenceBoundary); // Replace remaining newlines with spaces. - temp.replace("\n"," "); - temp.replace("\r"," "); + temp.tqreplace("\n"," "); + temp.tqreplace("\r"," "); // Remove leading spaces. - temp.replace(TQRegExp("\\t +"), "\t"); + temp.tqreplace(TQRegExp("\\t +"), "\t"); // Remove trailing spaces. - temp.replace(TQRegExp(" +\\t"), "\t"); + temp.tqreplace(TQRegExp(" +\\t"), "\t"); // Remove blank lines. - temp.replace(TQRegExp("\t\t+"),"\t"); + temp.tqreplace(TQRegExp("\t\t+"),"\t"); return temp; } @@ -503,7 +503,7 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r { // Examine just the first 500 chars to see if it is code. TQString p = m_text.left( 500 ); - if ( p.contains( TQRegExp( "(/\\*)|(if\\b\\()|(^#include\\b)" ) ) ) + if ( p.tqcontains( TQRegExp( "(/\\*)|(if\\b\\()|(^#include\\b)" ) ) ) textType = ttCode; else textType = ttPlain; @@ -515,7 +515,7 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r if ( re.isEmpty() ) re = m_configuredRe; // Replace spaces, tabs, and formfeeds with a single space. - m_text.replace(TQRegExp("[ \\t\\f]+"), " "); + m_text.tqreplace(TQRegExp("[ \\t\\f]+"), " "); // Perform the filtering based on type of text. switch ( textType ) @@ -534,7 +534,7 @@ TQString SbdThread::parsePlainText( const TQString& inputText, const TQString& r } // Clear app-specified sentence delimiter. App must call setSbRegExp for each conversion. - m_re = TQString::null; + m_re = TQString(); // kdDebug() << "SbdThread::run: filtered text = " << m_text << endl; @@ -562,11 +562,11 @@ bool SbdThread::event ( TQEvent * e ) /** * Constructor. */ -SbdProc::SbdProc( TQObject *parent, const char *name, const TQStringList& /*args*/) : - KttsFilterProc(parent, name) +SbdProc::SbdProc( TQObject *tqparent, const char *name, const TQStringList& /*args*/) : + KttsFilterProc(tqparent, name) { // kdDebug() << "SbdProc::SbdProc: Running" << endl; - m_sbdThread = new SbdThread( parent, *name + "_thread" ); + m_sbdThread = new SbdThread( tqparent, *name + "_thread" ); connect( m_sbdThread, TQT_SIGNAL(filteringFinished()), this, TQT_SLOT(slotSbdThreadFilteringFinished()) ); } @@ -603,7 +603,7 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){ m_configuredRe = config->readEntry( "SentenceDelimiterRegExp", "([\\.\\?\\!\\:\\;])(\\s|$|(\\n *\\n))" ); m_sbdThread->setConfiguredSbRegExp( m_configuredRe ); TQString sb = config->readEntry( "SentenceBoundary", "\\1\t" ); - sb.replace( "\\t", "\t" ); + sb.tqreplace( "\\t", "\t" ); m_sbdThread->setConfiguredSentenceBoundary( sb ); m_appIdList = config->readListEntry( "AppID" ); m_languageCodeList = config->readListEntry( "LanguageCodes" ); @@ -672,14 +672,14 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){ TQString languageCode = talkerCode->languageCode(); // kdDebug() << "StringReplacerProc::convert: converting " << inputText << // " if language code " << languageCode << " matches " << m_languageCodeList << endl; - if ( !m_languageCodeList.contains( languageCode ) ) + if ( !m_languageCodeList.tqcontains( languageCode ) ) { if ( !talkerCode->countryCode().isEmpty() ) { languageCode += '_' + talkerCode->countryCode(); // kdDebug() << "StringReplacerProc::convert: converting " << inputText << // " if language code " << languageCode << " matches " << m_languageCodeList << endl; - if ( !m_languageCodeList.contains( languageCode ) ) return false; + if ( !m_languageCodeList.tqcontains( languageCode ) ) return false; } else return false; } } @@ -692,7 +692,7 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){ TQString appIdStr = appId; for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) { - if ( appIdStr.contains(m_appIdList[ndx]) ) + if ( appIdStr.tqcontains(m_appIdList[ndx]) ) { found = true; break; @@ -737,7 +737,7 @@ bool SbdProc::init(KConfig* config, const TQString& configGroup){ /*virtual*/ void SbdProc::ackFinished() { m_state = fsIdle; - m_sbdThread->setText( TQString::null ); + m_sbdThread->setText( TQString() ); } /** diff --git a/kttsd/filters/sbd/sbdproc.h b/kttsd/filters/sbd/sbdproc.h index 4592c29..49f7b09 100644 --- a/kttsd/filters/sbd/sbdproc.h +++ b/kttsd/filters/sbd/sbdproc.h @@ -45,7 +45,7 @@ #ifndef _SBDPROC_H_ #define _SBDPROC_H_ -// Qt includes. +// TQt includes. #include <tqobject.h> #include <tqstringlist.h> #include <tqthread.h> @@ -60,15 +60,16 @@ class KConfig; class TQDomElement; class TQDomNode; -class SbdThread: public TQObject, public QThread +class SbdThread: public TQObject, public TQThread { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - SbdThread( TQObject *parent = 0, const char *name = 0); + SbdThread( TQObject *tqparent = 0, const char *name = 0); /** * Destructor. @@ -203,7 +204,7 @@ class SbdThread: public TQObject, public QThread TQString startSentence(); // Ends a sentence and appends a Tab. TQString endSentence(); - // Parses a node of the SSML tree and recursively parses its children. + // Parses a node of the SSML tree and recursively parses its tqchildren. // Returns the filtered text with each sentence a complete ssml tree. TQString parseSsmlNode( TQDomNode& n, const TQString& re ); @@ -240,12 +241,13 @@ class SbdThread: public TQObject, public QThread class SbdProc : virtual public KttsFilterProc { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - SbdProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); + SbdProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/stringreplacer/editreplacementwidget.ui b/kttsd/filters/stringreplacer/editreplacementwidget.ui index 917cdf8..6046580 100644 --- a/kttsd/filters/stringreplacer/editreplacementwidget.ui +++ b/kttsd/filters/stringreplacer/editreplacementwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EditReplacementWidget</class> <author>Gary Cramblitt <garycramblitt@comcast.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EditReplacementWidget</cstring> </property> @@ -21,7 +21,7 @@ <verstretch>255</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> @@ -31,15 +31,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>typeButtonGroup</cstring> </property> @@ -61,15 +61,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>wordRadioButton</cstring> </property> @@ -88,7 +88,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>regexpRadioButton</cstring> </property> @@ -108,7 +108,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>caseCheckBox</cstring> </property> @@ -126,23 +126,23 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>substLabel</cstring> </property> @@ -157,14 +157,14 @@ <property name="text"> <string>&Replace with:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> <cstring>matchLineEdit</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>matchLabel</cstring> </property> @@ -179,7 +179,7 @@ <property name="text"> <string>&Match:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -188,9 +188,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> @@ -254,7 +254,7 @@ <tabstop>matchButton</tabstop> <tabstop>substLineEdit</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.cpp b/kttsd/filters/stringreplacer/stringreplacerconf.cpp index 72f50d8..8bce00d 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerconf.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqfile.h> #include <tqfileinfo.h> #include <tqstring.h> @@ -59,19 +59,19 @@ /** * Constructor */ -StringReplacerConf::StringReplacerConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(parent, name), +StringReplacerConf::StringReplacerConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(tqparent, name), m_editDlg(0), m_editWidget(0) { // kdDebug() << "StringReplacerConf::StringReplacerConf: Running" << endl; // Create configuration widget. - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "StringReplacerConfigWidgetLayout"); - layout->setAlignment (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new StringReplacerConfWidget(this, "StringReplacerConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); m_widget->substLView->setSortColumn(-1); connect(m_widget->nameLineEdit, TQT_SIGNAL(textChanged(const TQString&)), @@ -244,7 +244,7 @@ TQString StringReplacerConf::loadFromFile( const TQString& filename, bool clear) item = new KListViewItem(m_widget->substLView, item, wordTypeStr, matchCaseStr, match, subst); } - return TQString::null; + return TQString(); } /** @@ -308,7 +308,7 @@ TQString StringReplacerConf::saveToFile(const TQString& filename) } // Application ID - TQString appId = m_widget->appIdLineEdit->text().replace(" ", ""); + TQString appId = m_widget->appIdLineEdit->text().tqreplace(" ", ""); if ( !appId.isEmpty() ) { TQStringList appIdList = TQStringList::split(",", appId); @@ -359,7 +359,7 @@ TQString StringReplacerConf::saveToFile(const TQString& filename) // kdDebug() << "StringReplacerConf::saveToFile: writing out " << doc.toString() << endl; file.close(); - return TQString::null; + return TQString(); } /** @@ -400,7 +400,7 @@ bool StringReplacerConf::supportsMultiInstance() { return true; } */ TQString StringReplacerConf::userPlugInName() { - if ( m_widget->substLView->childCount() == 0 ) return TQString::null; + if ( m_widget->substLView->childCount() == 0 ) return TQString(); TQString instName = m_widget->nameLineEdit->text(); if ( instName.isEmpty() ) { @@ -442,7 +442,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() if (!countryCode.isEmpty()) language += " (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")"; item = new KListViewItem(langLView, language, locale); - if (m_languageCodeList.contains(locale)) item->setSelected(true); + if (m_languageCodeList.tqcontains(locale)) item->setSelected(true); } // Sort by language. langLView->setSorting(0); @@ -461,7 +461,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() dlg->setHelp("", "kttsd"); dlg->setInitialSize(TQSize(300, 500), false); int dlgResult = dlg->exec(); - languageCode = TQString::null; + languageCode = TQString(); if (dlgResult == TQDialog::Accepted) { m_languageCodeList.clear(); @@ -473,7 +473,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() } } delete dlg; - // TODO: Also delete KListView and QHBox? + // TODO: Also delete KListView and TQHBox? if (dlgResult != TQDialog::Accepted) return; language = ""; for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx) @@ -488,11 +488,11 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked() if (m_languageCodeList.count() > 1) language = i18n("Multiple Languages"); if ( !s1.isEmpty() ) { - s2.replace( s1, language ); - s2.replace( i18n("Multiple Languages"), language ); + s2.tqreplace( s1, language ); + s2.tqreplace( i18n("Multiple Languages"), language ); } - s2.replace(" ()", ""); - if ( !s2.contains("(") && !language.isEmpty() ) s2 += " (" + language + ")"; + s2.tqreplace(" ()", ""); + if ( !s2.tqcontains("(") && !language.isEmpty() ) s2 += " (" + language + ")"; m_widget->nameLineEdit->setText(s2); configChanged(); } diff --git a/kttsd/filters/stringreplacer/stringreplacerconf.h b/kttsd/filters/stringreplacer/stringreplacerconf.h index 1606390..4de870c 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconf.h +++ b/kttsd/filters/stringreplacer/stringreplacerconf.h @@ -24,7 +24,7 @@ #ifndef _STRINGREPLACERCONF_H_ #define _STRINGREPLACERCONF_H_ -// Qt includes. +// TQt includes. #include <tqwidget.h> // KDE includes. @@ -43,12 +43,13 @@ class EditReplacementWidget; class StringReplacerConf : public KttsFilterConf { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - StringReplacerConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); + StringReplacerConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui index e88307f..c1882a0 100644 --- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui +++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui @@ -2,7 +2,7 @@ <class>StringReplacerConfWidget</class> <comment>Widget for configuring String Replacer Filter for KTTSD.</comment> <author>Gary Cramblitt <garycramblitt@comcast.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>StringReplacerConfWidget</cstring> </property> @@ -21,22 +21,22 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>nameLabel</cstring> </property> <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -57,7 +57,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>applyGroupBox</cstring> </property> @@ -71,22 +71,22 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>languageLabel</cstring> </property> <property name="text"> <string>Lan&guage is:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -97,14 +97,14 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>appIdLabel</cstring> </property> <property name="text"> - <string>Application &ID contains:</string> + <string>Application &ID tqcontains:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -116,17 +116,17 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -168,9 +168,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -241,9 +241,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout24</cstring> + <cstring>tqlayout24</cstring> </property> <grid> <property name="name"> @@ -301,9 +301,9 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout23</cstring> + <cstring>tqlayout23</cstring> </property> <vbox> <property name="name"> @@ -329,7 +329,7 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>upButton</cstring> </property> @@ -348,7 +348,7 @@ <string>Click to move selected word up in the list. Words higher in the list are applied first.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>downButton</cstring> </property> @@ -427,7 +427,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -457,7 +457,7 @@ <tabstop>languageBrowseButton</tabstop> <tabstop>appIdLineEdit</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.cpp b/kttsd/filters/stringreplacer/stringreplacerproc.cpp index 8987d79..4cee1e7 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.cpp +++ b/kttsd/filters/stringreplacer/stringreplacerproc.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqdom.h> #include <tqfile.h> #include <tqlistview.h> @@ -44,8 +44,8 @@ /** * Constructor. */ -StringReplacerProc::StringReplacerProc( TQObject *parent, const char *name, const TQStringList& ) : - KttsFilterProc(parent, name) +StringReplacerProc::StringReplacerProc( TQObject *tqparent, const char *name, const TQStringList& ) : + KttsFilterProc(tqparent, name) { } @@ -180,14 +180,14 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){ TQString languageCode = talkerCode->languageCode(); // kdDebug() << "StringReplacerProc::convert: converting " << inputText << // " if language code " << languageCode << " matches " << m_languageCodeList << endl; - if ( !m_languageCodeList.contains( languageCode ) ) + if ( !m_languageCodeList.tqcontains( languageCode ) ) { if ( !talkerCode->countryCode().isEmpty() ) { languageCode += '_' + talkerCode->countryCode(); // kdDebug() << "StringReplacerProc::convert: converting " << inputText << // " if language code " << languageCode << " matches " << m_languageCodeList << endl; - if ( !m_languageCodeList.contains( languageCode ) ) return inputText; + if ( !m_languageCodeList.tqcontains( languageCode ) ) return inputText; } else return inputText; } } @@ -200,7 +200,7 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){ TQString appIdStr = appId; for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) { - if ( appIdStr.contains(m_appIdList[ndx]) ) + if ( appIdStr.tqcontains(m_appIdList[ndx]) ) { found = true; break; @@ -217,7 +217,7 @@ bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){ for ( int index = 0; index < listCount; ++index ) { //kdDebug() << "newtext = " << newText << " matching " << m_matchList[index].pattern() << " replacing with " << m_substList[index] << endl; - newText.replace( m_matchList[index], m_substList[index] ); + newText.tqreplace( m_matchList[index], m_substList[index] ); } m_wasModified = true; return newText; diff --git a/kttsd/filters/stringreplacer/stringreplacerproc.h b/kttsd/filters/stringreplacer/stringreplacerproc.h index b679113..175bda8 100644 --- a/kttsd/filters/stringreplacer/stringreplacerproc.h +++ b/kttsd/filters/stringreplacer/stringreplacerproc.h @@ -25,7 +25,7 @@ #ifndef _STRINGREPLACERPROC_H_ #define _STRINGREPLACERPROC_H_ -// Qt includes. +// TQt includes. #include <tqobject.h> #include <tqtextstream.h> #include <tqvaluelist.h> @@ -38,12 +38,13 @@ class StringReplacerProc : virtual public KttsFilterProc { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - StringReplacerProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); + StringReplacerProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.cpp b/kttsd/filters/talkerchooser/talkerchooserconf.cpp index cc811a3..b351df9 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserconf.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqhbox.h> #include <tqlayout.h> @@ -49,17 +49,17 @@ /** * Constructor */ -TalkerChooserConf::TalkerChooserConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(parent, name) +TalkerChooserConf::TalkerChooserConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(tqparent, name) { // kdDebug() << "TalkerChooserConf::TalkerChooserConf: Running" << endl; // Create configuration widget. - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "TalkerChooserConfigWidgetLayout"); - layout->setAlignment (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new TalkerChooserConfWidget(this, "TalkerChooserConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // Determine if kdeutils Regular Expression Editor is installed. m_reEditorInstalled = !KTrader::self()->query("KRegExpEditor/KRegExpEditor").isEmpty(); @@ -147,7 +147,7 @@ void TalkerChooserConf::save(KConfig* config, const TQString& configGroup){ config->setGroup( configGroup ); config->writeEntry( "UserFilterName", m_widget->nameLineEdit->text() ); config->writeEntry( "MatchRegExp", m_widget->reLineEdit->text() ); - config->writeEntry( "AppIDs", m_widget->appIdLineEdit->text().replace(" ", "") ); + config->writeEntry( "AppIDs", m_widget->appIdLineEdit->text().tqreplace(" ", "") ); config->writeEntry( "TalkerCode", m_talkerCode.getTalkerCode()); } @@ -167,7 +167,7 @@ void TalkerChooserConf::defaults(){ // Default App ID is blank. m_widget->appIdLineEdit->setText( "" ); // Default to using default Talker. - m_talkerCode = TalkerCode( TQString::null, false ); + m_talkerCode = TalkerCode( TQString(), false ); m_widget->talkerLineEdit->setText( m_talkerCode.getTranslatedDescription() ); } @@ -188,11 +188,11 @@ bool TalkerChooserConf::supportsMultiInstance() { return true; } */ TQString TalkerChooserConf::userPlugInName() { - if (m_widget->talkerLineEdit->text().isEmpty()) return TQString::null; + if (m_widget->talkerLineEdit->text().isEmpty()) return TQString(); if (m_widget->appIdLineEdit->text().isEmpty() && - m_widget->reLineEdit->text().isEmpty()) return TQString::null; + m_widget->reLineEdit->text().isEmpty()) return TQString(); TQString instName = m_widget->nameLineEdit->text(); - if (instName.isEmpty()) return TQString::null; + if (instName.isEmpty()) return TQString(); return instName; } @@ -260,10 +260,10 @@ void TalkerChooserConf::slotSaveButton_clicked() void TalkerChooserConf::slotClearButton_clicked() { - m_widget->nameLineEdit->setText( TQString::null ); - m_widget->reLineEdit->setText( TQString::null ); - m_widget->appIdLineEdit->setText( TQString::null ); - m_talkerCode = TalkerCode( TQString::null, false ); + m_widget->nameLineEdit->setText( TQString() ); + m_widget->reLineEdit->setText( TQString() ); + m_widget->appIdLineEdit->setText( TQString() ); + m_talkerCode = TalkerCode( TQString(), false ); m_widget->talkerLineEdit->setText( m_talkerCode.getTranslatedDescription() ); configChanged(); } diff --git a/kttsd/filters/talkerchooser/talkerchooserconf.h b/kttsd/filters/talkerchooser/talkerchooserconf.h index 38a6c49..be501a2 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconf.h +++ b/kttsd/filters/talkerchooser/talkerchooserconf.h @@ -24,7 +24,7 @@ #ifndef _TALKERCHOOSERCONF_H_ #define _TALKERCHOOSERCONF_H_ -// Qt includes. +// TQt includes. #include <tqwidget.h> // KDE includes. @@ -45,12 +45,13 @@ class EditReplacementWidget; class TalkerChooserConf : public KttsFilterConf { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - TalkerChooserConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); + TalkerChooserConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui index 3cdee2e..3ee9947 100644 --- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui +++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui @@ -2,7 +2,7 @@ <class>TalkerChooserConfWidget</class> <comment>Widget for configuring Talker Chooser Filter for KTTSD.</comment> <author>Gary Cramblitt <garycramblitt@comcast.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>TalkerChooserConfWidget</cstring> </property> @@ -21,22 +21,22 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout3</cstring> + <cstring>tqlayout3</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>nameLabel</cstring> </property> <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -57,7 +57,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>applyGroupBox</cstring> </property> @@ -71,22 +71,22 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>reLabel</cstring> </property> <property name="text"> - <string>Te&xt contains:</string> + <string>Te&xt tqcontains:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -97,14 +97,14 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>appIdLabel</cstring> </property> <property name="text"> - <string>Application &ID contains:</string> + <string>Application &ID tqcontains:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -116,17 +116,17 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> @@ -165,15 +165,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout19_2</cstring> + <cstring>tqlayout19_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>talkerLabel</cstring> </property> @@ -226,9 +226,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -304,7 +304,7 @@ <tabstop>reEditorButton</tabstop> <tabstop>appIdLineEdit</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.cpp b/kttsd/filters/talkerchooser/talkerchooserproc.cpp index 5758df2..8d4aeb0 100644 --- a/kttsd/filters/talkerchooser/talkerchooserproc.cpp +++ b/kttsd/filters/talkerchooser/talkerchooserproc.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqregexp.h> // KDE includes. @@ -38,8 +38,8 @@ /** * Constructor. */ -TalkerChooserProc::TalkerChooserProc( TQObject *parent, const char *name, const TQStringList& /*args*/ ) : - KttsFilterProc(parent, name) +TalkerChooserProc::TalkerChooserProc( TQObject *tqparent, const char *name, const TQStringList& /*args*/ ) : + KttsFilterProc(tqparent, name) { // kdDebug() << "TalkerChooserProc::TalkerChooserProc: Running" << endl; } @@ -107,7 +107,7 @@ bool TalkerChooserProc::init(KConfig* config, const TQString& configGroup){ { if ( !m_re.isEmpty() ) { - int pos = inputText.find( TQRegExp(m_re) ); + int pos = inputText.tqfind( TQRegExp(m_re) ); if ( pos < 0 ) return inputText; } // If appId doesn't match, return input unmolested. @@ -119,7 +119,7 @@ bool TalkerChooserProc::init(KConfig* config, const TQString& configGroup){ TQString appIdStr = appId; for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) { - if ( appIdStr.contains(m_appIdList[ndx]) ) + if ( appIdStr.tqcontains(m_appIdList[ndx]) ) { found = true; break; diff --git a/kttsd/filters/talkerchooser/talkerchooserproc.h b/kttsd/filters/talkerchooser/talkerchooserproc.h index 8c9ab01..a422000 100644 --- a/kttsd/filters/talkerchooser/talkerchooserproc.h +++ b/kttsd/filters/talkerchooser/talkerchooserproc.h @@ -31,12 +31,13 @@ class TalkerChooserProc : virtual public KttsFilterProc { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - TalkerChooserProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); + TalkerChooserProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/filters/xhtml2ssml/Doxyfile b/kttsd/filters/xhtml2ssml/Doxyfile index 0061358..6313df1 100644 --- a/kttsd/filters/xhtml2ssml/Doxyfile +++ b/kttsd/filters/xhtml2ssml/Doxyfile @@ -17,7 +17,7 @@ ABBREVIATE_BRIEF = "The $name class" \ is \ provides \ specifies \ - contains \ + tqcontains \ represents \ a \ an \ @@ -120,7 +120,7 @@ FILE_PATTERNS = *.c \ *.tlh \ *.diff \ *.patch \ - *.moc \ + *.tqmoc \ *.xpm \ *.dox RECURSIVE = yes diff --git a/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp b/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp index 5649cc9..916ec48 100644 --- a/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp +++ b/kttsd/filters/xhtml2ssml/xhtml2ssml.cpp @@ -63,7 +63,7 @@ bool XHTMLToSSMLParser::startElement(const TQString &, const TQString &, const T // append to the output string. TQString toelement = m_xhtml2ssml[fromelement]; if(toelement) - m_output.append(XMLElement::fromQString(toelement).startTag()); + m_output.append(XMLElement::fromTQString(toelement).startTag()); return true; } @@ -71,7 +71,7 @@ bool XHTMLToSSMLParser::endElement(const TQString &, const TQString &, const TQS TQString fromelement = qName; TQString toelement = m_xhtml2ssml[fromelement]; if(toelement) - m_output.append(XMLElement::fromQString(toelement).endTag()); + m_output.append(XMLElement::fromTQString(toelement).endTag()); return true; } @@ -94,10 +94,10 @@ bool XHTMLToSSMLParser::readFileConfigEntry(const TQString &line) { if(line.stripWhiteSpace().startsWith("#")) { return true; } - // break into QStringList + // break into TQStringList // the second parameter to split is the string, with all space simplified and all space around the : removed, i.e // "something : somethingelse" -> "something:somethingelse" - TQStringList keyvalue = TQStringList::split(":", line.simplifyWhiteSpace().replace(" :", ":").replace(": ", ":")); + TQStringList keyvalue = TQStringList::split(":", line.simplifyWhiteSpace().tqreplace(" :", ":").tqreplace(": ", ":")); if(keyvalue.count() != 2) return false; m_xhtml2ssml[keyvalue[0]] = keyvalue[1]; diff --git a/kttsd/filters/xhtml2ssml/xhtml2ssml.h b/kttsd/filters/xhtml2ssml/xhtml2ssml.h index 4668d90..a4eae56 100644 --- a/kttsd/filters/xhtml2ssml/xhtml2ssml.h +++ b/kttsd/filters/xhtml2ssml/xhtml2ssml.h @@ -25,7 +25,7 @@ #include <tqxml.h> #include <tqmap.h> -typedef TQMap<TQString, TQString> QStringMap; +typedef TQMap<TQString, TQString> TQStringMap; class TQString; class XHTMLToSSMLParser : public TQXmlDefaultHandler { @@ -53,7 +53,7 @@ public: private: /// Dict of xhtml tags -> ssml tags - QStringMap m_xhtml2ssml; + TQStringMap m_xhtml2ssml; /// The output of the conversion TQString m_output; }; diff --git a/kttsd/filters/xhtml2ssml/xmlelement.cpp b/kttsd/filters/xhtml2ssml/xmlelement.cpp index 920fd57..45952ae 100644 --- a/kttsd/filters/xhtml2ssml/xmlelement.cpp +++ b/kttsd/filters/xhtml2ssml/xmlelement.cpp @@ -74,12 +74,12 @@ TQString XMLElement::attribute(const TQString &attr) { return m_attrmapper[attr]; } -TQString XMLElement::toQString() { +TQString XMLElement::toTQString() { TQString tag = startTag(); return tag.left(tag.length() - 1).right(tag.length() - 2); } -XMLElement XMLElement::fromQString(const TQString &str) { +XMLElement XMLElement::fromTQString(const TQString &str) { TQStringList sections = TQStringList::split(" ", str); TQString tagname = sections[0]; XMLElement e(tagname.latin1()); @@ -91,7 +91,7 @@ XMLElement XMLElement::fromQString(const TQString &str) { for(int i = 0; i < sectionsCount; ++i) { TQStringList list = TQStringList::split("=", sections[i]); if(list.count() != 2) { - std::cerr << "XMLElement::fromQString: Cannot convert list: " << list.join("|") << ". `" << str << "' is not in valid format.\n"; + std::cerr << "XMLElement::fromTQString: Cannot convert list: " << list.join("|") << ". `" << str << "' is not in valid format.\n"; return XMLElement(" "); } e.setAttribute(list[0], list[1].left(list[1].length() - 1).right(list[1].length() -2)); diff --git a/kttsd/filters/xhtml2ssml/xmlelement.h b/kttsd/filters/xhtml2ssml/xmlelement.h index f92e933..11c7cef 100644 --- a/kttsd/filters/xhtml2ssml/xmlelement.h +++ b/kttsd/filters/xhtml2ssml/xmlelement.h @@ -75,11 +75,11 @@ public: /// Had issues with TQMap and custom classes. For now you can just convert to/from TQString and use /// That as the key/value pair. /// @returns A TQString representation of the XMLAttribute. - TQString toQString(); + TQString toTQString(); /// Create an XMLElement from a TQString. /// @param str The TQString to convert from. Must be of the following syntax- "foo name=\"bar\"" - static XMLElement fromQString(const TQString &str); + static XMLElement fromTQString(const TQString &str); private: /// The name of the tag. diff --git a/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl b/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl index 2c1f3be..f289252 100644 --- a/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl +++ b/kttsd/filters/xmltransformer/xhtml2ssml_simple.xsl @@ -52,22 +52,22 @@ </xsl:template> <!-- H1, H2, H3, H4, H5, H6: ignore tag, speak content as sentence. --> -<xsl:template match="*[contains('h1|h2|h3|h4|h5|h6|H1|H2|H3|H4|H5|H6|',concat(local-name(),'|'))]"> +<xsl:template match="*[tqcontains('h1|h2|h3|h4|h5|h6|H1|H2|H3|H4|H5|H6|',concat(local-name(),'|'))]"> <xsl:apply-templates/> </xsl:template> <!-- DFN, LI, DD, DT: ignore tag, speak content. --> -<xsl:template match="*[contains('dfn|li|dd|dt|DFN|LI|DD|DT|',concat(local-name(),'|'))]"> +<xsl:template match="*[tqcontains('dfn|li|dd|dt|DFN|LI|DD|DT|',concat(local-name(),'|'))]"> <xsl:apply-templates/> </xsl:template> <!-- PRE, CODE, TT; ignore tag, speak content. --> -<xsl:template match="*[contains('pre|code|tt|PRE|CODE|TT|',concat(local-name(),'|'))]"> +<xsl:template match="*[tqcontains('pre|code|tt|PRE|CODE|TT|',concat(local-name(),'|'))]"> <xsl:apply-templates/> </xsl:template> <!-- EM, STRONG, I, B, S, STRIKE, U: speak emphasized. --> -<xsl:template match="*[contains('em|strong|i|b|s|strike|EM|STRONG|I|B|S|STRIKE|',concat(local-name(),'|'))]"> +<xsl:template match="*[tqcontains('em|strong|i|b|s|strike|EM|STRONG|I|B|S|STRIKE|',concat(local-name(),'|'))]"> <emphasis level="strong"> <xsl:apply-templates/> </emphasis> diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.cpp b/kttsd/filters/xmltransformer/xmltransformerconf.cpp index c70c449..dd4bb54 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerconf.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqlayout.h> @@ -43,17 +43,17 @@ /** * Constructor */ -XmlTransformerConf::XmlTransformerConf( TQWidget *parent, const char *name, const TQStringList& /*args*/) : - KttsFilterConf(parent, name) +XmlTransformerConf::XmlTransformerConf( TQWidget *tqparent, const char *name, const TQStringList& /*args*/) : + KttsFilterConf(tqparent, name) { // kdDebug() << "XmlTransformerConf::XmlTransformerConf: Running" << endl; // Create configuration widget. - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "XmlTransformerConfWidgetLayout"); - layout->setAlignment (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new XmlTransformerConfWidget(this, "XmlTransformerConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // Set up defaults. defaults(); @@ -125,7 +125,7 @@ void XmlTransformerConf::save(KConfig* config, const TQString& configGroup){ config->writeEntry( "XsltprocPath", realFilePath( m_widget->xsltprocPath->url() ) ); config->writeEntry( "RootElement", m_widget->rootElementLineEdit->text() ); config->writeEntry( "DocType", m_widget->doctypeLineEdit->text() ); - config->writeEntry( "AppID", m_widget->appIdLineEdit->text().replace(" ", "") ); + config->writeEntry( "AppID", m_widget->appIdLineEdit->text().tqreplace(" ", "") ); } /** @@ -170,13 +170,13 @@ bool XmlTransformerConf::supportsMultiInstance() { return true; } TQString XmlTransformerConf::userPlugInName() { TQString filePath = realFilePath(m_widget->xsltprocPath->url()); - if (filePath.isEmpty()) return TQString::null; - if (getLocation(filePath).isEmpty()) return TQString::null; + if (filePath.isEmpty()) return TQString(); + if (getLocation(filePath).isEmpty()) return TQString(); filePath = realFilePath(m_widget->xsltPath->url()); - if (filePath.isEmpty()) return TQString::null; - if (getLocation(filePath).isEmpty()) return TQString::null; - if (!TQFileInfo(filePath).isFile()) return TQString::null; + if (filePath.isEmpty()) return TQString(); + if (getLocation(filePath).isEmpty()) return TQString(); + if (!TQFileInfo(filePath).isFile()) return TQString(); return m_widget->nameLineEdit->text(); } diff --git a/kttsd/filters/xmltransformer/xmltransformerconf.h b/kttsd/filters/xmltransformer/xmltransformerconf.h index caec175..c10b90b 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconf.h +++ b/kttsd/filters/xmltransformer/xmltransformerconf.h @@ -24,7 +24,7 @@ #ifndef _XMLTRANSFORMERCONF_H_ #define _XMLTRANSFORMERCONF_H_ -// Qt includes. +// TQt includes. #include <tqwidget.h> // KDE includes. @@ -40,12 +40,13 @@ class XmlTransformerConf : public KttsFilterConf { Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - XmlTransformerConf( TQWidget *parent, const char *name, const TQStringList &args = TQStringList() ); + XmlTransformerConf( TQWidget *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor diff --git a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui index 4975d9c..cd00de3 100644 --- a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui +++ b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>XmlTransformerConfWidget</class> <author>Gary Cramblitt <garycramblitt@comcast.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>XmlTransformerConfWidget</cstring> </property> @@ -20,9 +20,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> @@ -57,22 +57,22 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>nameLabel</cstring> </property> <property name="text"> <string>&Name:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -83,14 +83,14 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>xsltLabel</cstring> </property> <property name="text"> <string>&XSLT file:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -100,14 +100,14 @@ <string>Enter the full path to an XML Style Language - Transforms (XSLT) stylesheet file. XSLT files usually end with extension .xsl.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>xsltprocLabel</cstring> </property> <property name="text"> <string>xsltproc &executable:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -119,7 +119,7 @@ </widget> </vbox> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>applyGroupBox</cstring> </property> @@ -133,9 +133,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> @@ -167,22 +167,22 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>rootElementLabel</cstring> </property> <property name="text"> <string>&Root element is:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -193,14 +193,14 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>doctypeLabel</cstring> </property> <property name="text"> <string>or DOC&TYPE is:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -210,14 +210,14 @@ <string>This filter will be applied only to text having the specified DOCTYPE specification. If blank, applies to all text. You may enter more than one DOCTYPE separated by commas. Example: "xhtml".</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>appIdLabel</cstring> </property> <property name="text"> - <string>and Application &ID contains:</string> + <string>and Application &ID tqcontains:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -233,7 +233,7 @@ </widget> </grid> </widget> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>kurlrequester.h</includehint> diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.cpp b/kttsd/filters/xmltransformer/xmltransformerproc.cpp index b4b9f71..f9fc2e6 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.cpp +++ b/kttsd/filters/xmltransformer/xmltransformerproc.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqfile.h> #include <tqregexp.h> @@ -44,8 +44,8 @@ /** * Constructor. */ -XmlTransformerProc::XmlTransformerProc( TQObject *parent, const char *name, const TQStringList& ) : - KttsFilterProc(parent, name) +XmlTransformerProc::XmlTransformerProc( TQObject *tqparent, const char *name, const TQStringList& ) : + KttsFilterProc(tqparent, name) { m_xsltProc = 0; } @@ -198,7 +198,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup) found = false; for ( uint ndx=0; ndx < m_appIdList.count(); ++ndx ) { - if ( appIdStr.contains(m_appIdList[ndx]) ) + if ( appIdStr.tqcontains(m_appIdList[ndx]) ) { found = true; break; @@ -227,7 +227,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup) // This will change & inside a CDATA section, which is not good, and also within comments and // processing instructions, which is OK because we don't speak those anyway. TQString text = inputText; - text.replace(TQRegExp("&(?!amp;)"),"&"); + text.tqreplace(TQRegExp("&(?!amp;)"),"&"); *wstream << text; inFile.close(); #if KDE_VERSION >= KDE_MAKE_VERSION (3,3,0) @@ -282,7 +282,7 @@ void XmlTransformerProc::processOutput() if (exitStatus != 0) { - kdDebug() << "XmlTransformerProc::processOutput: xsltproc abnormal exit. Status = " << exitStatus << endl; + kdDebug() << "XmlTransformerProc::processOutput: xsltproc abnormal exit. tqStatus = " << exitStatus << endl; m_state = fsFinished; TQFile::remove(m_outFilename); emit filteringFinished(); @@ -346,7 +346,7 @@ void XmlTransformerProc::processOutput() /*virtual*/ void XmlTransformerProc::ackFinished() { m_state = fsIdle; - m_text = TQString::null; + m_text = TQString(); } /** @@ -373,13 +373,13 @@ void XmlTransformerProc::slotProcessExited(KProcess*) void XmlTransformerProc::slotReceivedStdout(KProcess*, char* /*buffer*/, int /*buflen*/) { - // TQString buf = TQString::fromLatin1(buffer, buflen); + // TQString buf = TQString::tqfromLatin1(buffer, buflen); // kdDebug() << "XmlTransformerProc::slotReceivedStdout: Received from xsltproc: " << buf << endl; } void XmlTransformerProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); kdDebug() << "XmlTransformerProc::slotReceivedStderr: Received error from xsltproc: " << buf << endl; } diff --git a/kttsd/filters/xmltransformer/xmltransformerproc.h b/kttsd/filters/xmltransformer/xmltransformerproc.h index d50adeb..4f8b82b 100644 --- a/kttsd/filters/xmltransformer/xmltransformerproc.h +++ b/kttsd/filters/xmltransformer/xmltransformerproc.h @@ -24,7 +24,7 @@ #ifndef _XMLTRANSFORMERPROC_H_ #define _XMLTRANSFORMERPROC_H_ -// Qt includes. +// TQt includes. #include <tqobject.h> #include <tqstringlist.h> @@ -36,12 +36,13 @@ class KProcess; class XmlTransformerProc : virtual public KttsFilterProc { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - XmlTransformerProc( TQObject *parent, const char *name, const TQStringList &args = TQStringList() ); + XmlTransformerProc( TQObject *tqparent, const char *name, const TQStringList &args = TQStringList() ); /** * Destructor. diff --git a/kttsd/kcmkttsmgr/addtalker.cpp b/kttsd/kcmkttsmgr/addtalker.cpp index 4a94cf3..5732372 100644 --- a/kttsd/kcmkttsmgr/addtalker.cpp +++ b/kttsd/kcmkttsmgr/addtalker.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqradiobutton.h> // KDE includes. @@ -34,8 +34,8 @@ // KTTS includes. #include "addtalker.h" -AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent, const char* name, WFlags fl) - : AddTalkerWidget(parent,name,fl) +AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* tqparent, const char* name, WFlags fl) + : AddTalkerWidget(tqparent,name,fl) { // Build maps. setSynthToLangMap(synthToLangMap); @@ -46,7 +46,7 @@ AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent, const char // Default to user's desktop language. TQString languageCode = KGlobal::locale()->defaultLanguage(); // If there is not a synth that supports the locale, try stripping country code. - if (!m_langToSynthMap.contains(languageCode)) + if (!m_langToSynthMap.tqcontains(languageCode)) { TQString countryCode; TQString charSet; @@ -55,7 +55,7 @@ AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent, const char languageCode = twoAlpha; } // If there is still not a synth that supports the language code, default to "other". - if (!m_langToSynthMap.contains(languageCode)) languageCode = "other"; + if (!m_langToSynthMap.tqcontains(languageCode)) languageCode = "other"; // Select the language in the language combobox. TQString language = languageCodeToLanguage(languageCode); diff --git a/kttsd/kcmkttsmgr/addtalker.h b/kttsd/kcmkttsmgr/addtalker.h index 33b9ba8..0c3f703 100644 --- a/kttsd/kcmkttsmgr/addtalker.h +++ b/kttsd/kcmkttsmgr/addtalker.h @@ -25,7 +25,7 @@ #ifndef ADDTALKER_H #define ADDTALKER_H -// Qt includes. +// TQt includes. #include <tqmap.h> #include "addtalkerwidget.h" @@ -36,15 +36,16 @@ typedef TQMap<TQString,TQStringList> LangToSynthMap; class AddTalker : public AddTalkerWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor. * @param synthToLangMap TQMap of supported language codes indexed by synthesizer. - * @param parent Inherited KDialog parameter. + * @param tqparent Inherited KDialog parameter. * @param name Inherited KDialog parameter. */ - AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); + AddTalker(SynthToLangMap synthToLangMap, TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0 ); /** * Destructor. diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui index f493138..a3cc11d 100644 --- a/kttsd/kcmkttsmgr/addtalkerwidget.ui +++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>AddTalkerWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>AddTalkerWidget</cstring> </property> @@ -19,7 +19,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>buttonGroup2</cstring> </property> @@ -80,21 +80,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>351</width> <height>21</height> </size> </property> </spacer> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>synthesizerLabel</cstring> </property> <property name="text"> <string>&Synthesizer:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -115,7 +115,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>25</width> <height>20</height> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -149,7 +149,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -166,14 +166,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>25</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="0" column="2" rowspan="1" colspan="3"> + <widget class="TQLabel" row="0" column="2" rowspan="1" colspan="3"> <property name="name"> <cstring>showAllLabel</cstring> </property> @@ -185,21 +185,21 @@ <property name="text"> <string>Show All</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="whatsThis" stdset="0"> <string>The radio buttons below determine which box shows all possibilities. The box to the left of the checked button shows all possibilities. The box to the left of the unchecked box only shows those possibilities that match the other box.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>languageLabel</cstring> </property> <property name="text"> <string>&Language:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -210,7 +210,7 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QRadioButton" row="1" column="3"> + <widget class="TQRadioButton" row="1" column="3"> <property name="name"> <cstring>languageRadioButton</cstring> </property> @@ -227,7 +227,7 @@ <string>Check to list all the possible languages in the Language box at the left. When a language has been chosen, the Synthesizer box will show only those synthesizers that can speak in the chosen language.</string> </property> </widget> - <widget class="QRadioButton" row="2" column="3"> + <widget class="TQRadioButton" row="2" column="3"> <property name="name"> <cstring>synthesizerRadioButton</cstring> </property> @@ -252,7 +252,7 @@ <tabstop>synthesizerSelection</tabstop> <tabstop>languageRadioButton</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index b8cf367..50c6f58 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -23,7 +23,7 @@ // C++ includes. #include <math.h> -// Qt includes. +// TQt includes. #include <tqwidget.h> #include <tqtabwidget.h> #include <tqcheckbox.h> @@ -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 *parent, const char *name, const TQStringList &) : +KCMKttsMgr::KCMKttsMgr(TQWidget *tqparent, const char *name, const TQStringList &) : DCOPStub("kttsd", "KSpeech"), DCOPObject("kcmkttsmgr_kspeechsink"), - KCModule(KCMKttsMgrFactory::instance(), parent, name) + KCModule(KCMKttsMgrFactory::instance(), tqparent, name) { // kdDebug() << "KCMKttsMgr contructor running." << endl; @@ -119,10 +119,10 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &) m_suppressConfigChanged = false; // Add the KTTS Manager widget - TQGridLayout *layout = new TQGridLayout(this, 0, 0); + TQGridLayout *tqlayout = new TQGridLayout(this, 0, 0); m_kttsmgrw = new KCMKttsMgrWidget(this, "kttsmgrw"); // m_kttsmgrw = new KCMKttsMgrWidget(this); - layout->addWidget(m_kttsmgrw, 0, 0); + tqlayout->addWidget(m_kttsmgrw, 0, 0); // Give buttons icons. // Talkers tab. @@ -430,7 +430,7 @@ void KCMKttsMgr::load() loadNotifyEventsFromFile( locateLocal("config", "kttsd_notifyevents.xml"), true ); slotNotifyEnableCheckBox_toggled( m_kttsmgrw->notifyEnableCheckBox->isChecked() ); // Auto-expand and position on the Default item. - TQListViewItem* item = m_kttsmgrw->notifyListView->findItem( "default", nlvcEventSrc ); + TQListViewItem* item = m_kttsmgrw->notifyListView->tqfindItem( "default", nlvcEventSrc ); if ( item ) if ( item->childCount() > 0 ) item = item->firstChild(); if ( item ) m_kttsmgrw->notifyListView->ensureItemVisible( item ); @@ -491,7 +491,7 @@ void KCMKttsMgr::load() TQString fullLanguageCode; talkerCode = TalkerCode::normalizeTalkerCode(talkerCode, fullLanguageCode); TQString language = TalkerCode::languageCodeToLanguage(fullLanguageCode); - TQString desktopEntryName = m_config->readEntry("DesktopEntryName", TQString::null); + TQString desktopEntryName = m_config->readEntry("DesktopEntryName", TQString()); // If a DesktopEntryName is not in the config file, it was configured before // we started using them, when we stored translated plugin names instead. // Try to convert the translated plugin name to a DesktopEntryName. @@ -500,7 +500,7 @@ void KCMKttsMgr::load() TQString synthName; if (desktopEntryName.isEmpty()) { - synthName = m_config->readEntry("PlugIn", TQString::null); + synthName = m_config->readEntry("PlugIn", TQString()); // See if the translated name will untranslate. If not, well, sorry. desktopEntryName = TalkerCode::TalkerNameToDesktopEntryName(synthName); // Record the DesktopEntryName from now on. @@ -542,7 +542,7 @@ void KCMKttsMgr::load() // All plugins support "Other". // TODO: Eventually, this should not be necessary, since all plugins will know // the languages they support and report them in call to getSupportedLanguages(). - if (!languageCodes.contains("other")) languageCodes.append("other"); + if (!languageCodes.tqcontains("other")) languageCodes.append("other"); // Add supported language codes to synthesizer-to-language map. m_synthToLangMap[synthName] = languageCodes; @@ -568,7 +568,7 @@ void KCMKttsMgr::load() TQString filterID = *it; // kdDebug() << "KCMKttsMgr::load: filterID = " << filterID << endl; m_config->setGroup("Filter_" + filterID); - TQString desktopEntryName = m_config->readEntry("DesktopEntryName", TQString::null); + TQString desktopEntryName = m_config->readEntry("DesktopEntryName", TQString()); // If a DesktopEntryName is not in the config file, it was configured before // we started using them, when we stored translated plugin names instead. // Try to convert the translated plugin name to a DesktopEntryName. @@ -577,7 +577,7 @@ void KCMKttsMgr::load() TQString filterPlugInName; if (desktopEntryName.isEmpty()) { - filterPlugInName = m_config->readEntry("PlugInName", TQString::null); + filterPlugInName = m_config->readEntry("PlugInName", TQString()); // See if the translated name will untranslate. If not, well, sorry. desktopEntryName = FilterNameToDesktopEntryName(filterPlugInName); // Record the DesktopEntryName from now on. @@ -822,7 +822,7 @@ void KCMKttsMgr::save() if (groupName.left(7) == "Talker_") { TQString groupTalkerID = groupName.mid(7); - if (!talkerIDsList.contains(groupTalkerID)) m_config->deleteGroup(groupName); + if (!talkerIDsList.tqcontains(groupTalkerID)) m_config->deleteGroup(groupName); } } @@ -862,7 +862,7 @@ void KCMKttsMgr::save() if (groupName.left(7) == "Filter_") { TQString groupFilterID = groupName.mid(7); - if (!filterIDsList.contains(groupFilterID)) m_config->deleteGroup(groupName); + if (!filterIDsList.tqcontains(groupFilterID)) m_config->deleteGroup(groupName); } } @@ -1100,7 +1100,7 @@ PlugInConf* KCMKttsMgr::loadTalkerPlugin(const TQString& name) // Find the plugin. KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin", - TQString("DesktopEntryName == '%1'").arg(name)); + TQString("DesktopEntryName == '%1'").tqarg(name)); if (offers.count() == 1) { @@ -1144,7 +1144,7 @@ KttsFilterConf* KCMKttsMgr::loadFilterPlugin(const TQString& plugInName) // Find the plugin. KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin", - TQString("DesktopEntryName == '%1'").arg(plugInName)); + TQString("DesktopEntryName == '%1'").tqarg(plugInName)); if (offers.count() == 1) { @@ -1271,10 +1271,10 @@ void KCMKttsMgr::slot_addTalker() dlg->setHelp("select-plugin", "kttsd"); dlg->setInitialSize(TQSize(200, 500), false); dlgResult = dlg->exec(); - languageCode = TQString::null; + languageCode = TQString(); if (langLView->selectedItem()) languageCode = langLView->selectedItem()->text(1); delete dlg; - // TODO: Also delete KListView and QHBox? + // TODO: Also delete KListView and TQHBox? if (dlgResult != TQDialog::Accepted) return; } @@ -1400,7 +1400,7 @@ void KCMKttsMgr::addFilter( bool sbd) { if (item->text(flvcMultiInstance) == "T") { - if (!filterPlugInNames.contains(item->text(flvcPlugInName))) + if (!filterPlugInNames.tqcontains(item->text(flvcPlugInName))) filterPlugInNames.append(item->text(flvcPlugInName)); } item = item->nextSibling(); @@ -1835,7 +1835,7 @@ void KCMKttsMgr::kttsdStarted() if (factory) { // Create the Job Manager part - m_jobMgrPart = (KParts::ReadOnlyPart *)factory->create( m_kttsmgrw->mainTab, "kttsjobmgr", + m_jobMgrPart = (KParts::ReadOnlyPart *)factory->create( TQT_TQOBJECT(m_kttsmgrw->mainTab), "kttsjobmgr", "KParts::ReadOnlyPart" ); if (m_jobMgrPart) { @@ -2063,7 +2063,7 @@ void KCMKttsMgr::configureTalker() } float audioStretchFactor = 1.0/(float(m_kttsmgrw->timeBox->value())/100.0); // kdDebug() << "KCMKttsMgr::configureTalker: playerOption = " << playerOption << " audioStretchFactor = " << audioStretchFactor << " sink name = " << sinkName << endl; - TestPlayer* testPlayer = new TestPlayer(this, "ktts_testplayer", + TestPlayer* testPlayer = new TestPlayer(TQT_TQOBJECT(this), "ktts_testplayer", playerOption, audioStretchFactor, sinkName); m_loadedTalkerPlugIn->setPlayer(testPlayer); // Display the dialog. @@ -2093,7 +2093,7 @@ void KCMKttsMgr::configureFilter() true, true); m_configDlg->setInitialSize(TQSize(600, 450), false); - m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->minimumSizeHint()); + m_loadedFilterPlugIn->setMinimumSize(m_loadedFilterPlugIn->tqminimumSizeHint()); m_loadedFilterPlugIn->show(); m_configDlg->setMainWidget(m_loadedFilterPlugIn); m_configDlg->setHelp("configure-filter", "kttsd"); @@ -2201,15 +2201,15 @@ void KCMKttsMgr::slotFiltersList_stateChanged() * Uses KTrader to convert a translated Filter Plugin Name to DesktopEntryName. * @param name The translated plugin name. From Name= line in .desktop file. * @return DesktopEntryName. The name of the .desktop file (less .desktop). - * TQString::null if not found. + * TQString() if not found. */ TQString KCMKttsMgr::FilterNameToDesktopEntryName(const TQString& name) { - if (name.isEmpty()) return TQString::null; + if (name.isEmpty()) return TQString(); KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin"); for (uint ndx = 0; ndx < offers.count(); ++ndx) if (offers[ndx]->name() == name) return offers[ndx]->desktopEntryName(); - return TQString::null; + return TQString(); } /** @@ -2219,14 +2219,14 @@ TQString KCMKttsMgr::FilterNameToDesktopEntryName(const TQString& name) */ TQString KCMKttsMgr::FilterDesktopEntryNameToName(const TQString& desktopEntryName) { - if (desktopEntryName.isEmpty()) return TQString::null; + if (desktopEntryName.isEmpty()) return TQString(); KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin", - TQString("DesktopEntryName == '%1'").arg(desktopEntryName)); + TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName)); if (offers.count() == 1) return offers[0]->name(); else - return TQString::null; + return TQString(); } /** @@ -2278,7 +2278,7 @@ TQString KCMKttsMgr::loadNotifyEventsFromFile( const TQString& filename, bool cl addNotifyItem(eventSrc, event, NotifyAction::action( actionName ), message, talkerCode); } - return TQString::null; + return TQString(); } /** @@ -2347,7 +2347,7 @@ TQString KCMKttsMgr::saveNotifyEventsToFile(const TQString& filename) ts << doc.toString(); file.close(); - return TQString::null; + return TQString(); } void KCMKttsMgr::slotNotifyEnableCheckBox_toggled(bool checked) @@ -2396,7 +2396,7 @@ void KCMKttsMgr::slotNotifyListView_selectionChanged() bool defaultItem = ( item->text(nlvcEventSrc) == "default" ); m_kttsmgrw->notifyRemoveButton->setEnabled( !defaultItem ); } else { - bool defaultItem = ( item->parent()->text(nlvcEventSrc) == "default" ); + bool defaultItem = ( item->tqparent()->text(nlvcEventSrc) == "default" ); m_kttsmgrw->notifyPresentComboBox->setEnabled( defaultItem ); if ( defaultItem ) m_kttsmgrw->notifyPresentComboBox->setCurrentItem( NotifyPresent::present( item->text( nlvcEvent ) ) ); @@ -2482,9 +2482,9 @@ void KCMKttsMgr::slotNotifyTestButton_clicked() break; case NotifyAction::SpeakCustom: msg = m_kttsmgrw->notifyMsgLineEdit->text(); - msg.replace("%a", i18n("sample application")); - msg.replace("%e", i18n("sample event")); - msg.replace("%m", i18n("sample notification message")); + msg.tqreplace("%a", i18n("sample application")); + msg.tqreplace("%e", i18n("sample event")); + msg.tqreplace("%m", i18n("sample notification message")); break; } if (!msg.isEmpty()) sayMessage(msg, item->text(nlvcTalker)); @@ -2533,7 +2533,7 @@ TQListViewItem* KCMKttsMgr::addNotifyItem( else { if (event == "default") - eventName = i18n("All other %1 events").arg(eventSrcName); + eventName = i18n("All other %1 events").tqarg(eventSrcName); else eventName = NotifyEvent::getEventName(eventSrc, event); } @@ -2543,23 +2543,23 @@ TQListViewItem* KCMKttsMgr::addNotifyItem( TQString talkerName = talkerCode.getTranslatedDescription(); if (!eventSrcName.isEmpty() && !eventName.isEmpty() && !actionName.isEmpty() && !talkerName.isEmpty()) { - TQListViewItem* parentItem = lv->findItem(eventSrcName, nlvcEventSrcName); - if (!parentItem) + TQListViewItem* tqparentItem = lv->tqfindItem(eventSrcName, nlvcEventSrcName); + if (!tqparentItem) { item = lv->lastItem(); if (!item) - parentItem = new KListViewItem(lv, eventSrcName, TQString::null, TQString::null, + tqparentItem = new KListViewItem(lv, eventSrcName, TQString(), TQString(), eventSrc); else - parentItem = new KListViewItem(lv, item, eventSrcName, TQString::null, TQString::null, + tqparentItem = new KListViewItem(lv, item, eventSrcName, TQString(), TQString(), eventSrc); if ( !iconName.isEmpty() ) - parentItem->setPixmap( nlvcEventSrcName, SmallIcon( iconName ) ); + tqparentItem->setPixmap( nlvcEventSrcName, SmallIcon( iconName ) ); } // No duplicates. - item = lv->findItem( event, nlvcEvent ); - if ( !item || item->parent() != parentItem ) - item = new KListViewItem(parentItem, eventName, actionDisplayName, talkerName, + item = lv->tqfindItem( event, nlvcEvent ); + if ( !item || item->tqparent() != tqparentItem ) + item = new KListViewItem(tqparentItem, eventName, actionDisplayName, talkerName, eventSrc, event, actionName, talkerCode.getTalkerCode()); if ( action == NotifyAction::DoNotSpeak ) item->setPixmap( nlvcActionName, SmallIcon( "nospeak" ) ); @@ -2599,7 +2599,7 @@ void KCMKttsMgr::slotNotifyAddButton_clicked() int action = NotifyAction::DoNotSpeak; TQString msg; TalkerCode talkerCode; - item = lv->findItem( "default", nlvcEventSrc ); + item = lv->tqfindItem( "default", nlvcEventSrc ); if ( item ) { if ( item->childCount() > 0 ) item = item->firstChild(); @@ -2631,7 +2631,7 @@ void KCMKttsMgr::slotNotifyClearButton_clicked() TQString("default"), NotifyPresent::presentName(NotifyPresent::Passive), NotifyAction::SpeakEventName, - TQString::null, + TQString(), talkerCode ); TQListView* lv = m_kttsmgrw->notifyListView; lv->ensureItemVisible( item ); @@ -2644,11 +2644,11 @@ void KCMKttsMgr::slotNotifyRemoveButton_clicked() { TQListViewItem* item = m_kttsmgrw->notifyListView->selectedItem(); if (!item) return; - TQListViewItem* parentItem = item->parent(); + TQListViewItem* tqparentItem = item->tqparent(); delete item; - if (parentItem) + if (tqparentItem) { - if (parentItem->childCount() == 0) delete parentItem; + if (tqparentItem->childCount() == 0) delete tqparentItem; } slotNotifyListView_selectionChanged(); configChanged(); @@ -2688,16 +2688,16 @@ void KCMKttsMgr::slotNotifySaveButton_clicked() // ---------------------------------------------------------------------------- -KttsCheckListItem::KttsCheckListItem( TQListView *parent, TQListViewItem *after, +KttsCheckListItem::KttsCheckListItem( TQListView *tqparent, TQListViewItem *after, const TQString &text, Type tt, KCMKttsMgr* kcmkttsmgr ) : - TQCheckListItem(parent, after, text, tt), + TQCheckListItem(tqparent, after, text, tt), m_kcmkttsmgr(kcmkttsmgr) { } -KttsCheckListItem::KttsCheckListItem( TQListView *parent, +KttsCheckListItem::KttsCheckListItem( TQListView *tqparent, const TQString &text, Type tt, KCMKttsMgr* kcmkttsmgr ) : - TQCheckListItem(parent, text, tt), + TQCheckListItem(tqparent, text, tt), m_kcmkttsmgr(kcmkttsmgr) { } /*virtual*/ void KttsCheckListItem::stateChange(bool) diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.h b/kttsd/kcmkttsmgr/kcmkttsmgr.h index 0fc4141..5edb02e 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.h +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.h @@ -21,7 +21,7 @@ #include "config.h" -// Qt includes. +// TQt includes. #include <tqmap.h> #include <tqlistview.h> @@ -55,9 +55,10 @@ class KCMKttsMgr : virtual public KSpeechSink { Q_OBJECT + TQ_OBJECT public: - KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &); + KCMKttsMgr(TQWidget *tqparent, const char *name, const TQStringList &); ~KCMKttsMgr(); @@ -285,7 +286,7 @@ class KCMKttsMgr : * Uses KTrader to convert a translated Filter Plugin Name to DesktopEntryName. * @param name The translated plugin name. From Name= line in .desktop file. * @return DesktopEntryName. The name of the .desktop file (less .desktop). - * TQString::null if not found. + * TQString() if not found. */ TQString FilterNameToDesktopEntryName(const TQString& name); @@ -510,13 +511,13 @@ class KCMKttsMgr : /// This is a small helper class to detect when user checks/unchecks a Filter in Filters tab /// and emit changed() signal. -class KttsCheckListItem : public QCheckListItem +class KttsCheckListItem : public TQCheckListItem { public: - KttsCheckListItem( TQListView *parent, + KttsCheckListItem( TQListView *tqparent, const TQString &text, Type tt = RadioButtonController, KCMKttsMgr* kcmkttsmgr = 0); - KttsCheckListItem( TQListView *parent, TQListViewItem *after, + KttsCheckListItem( TQListView *tqparent, TQListViewItem *after, const TQString &text, Type tt = RadioButtonController, KCMKttsMgr* kcmkttsmgr = 0); diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui index 36942a3..ab66ca2 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui +++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui @@ -25,7 +25,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QTabWidget" row="0" column="0"> + <widget class="TQTabWidget" row="0" column="0"> <property name="name"> <cstring>mainTab</cstring> </property> @@ -37,7 +37,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -48,7 +48,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>enableKttsdCheckBox</cstring> </property> @@ -59,7 +59,7 @@ <string>Check to start the KTTS Deamon and enable Text-to-Speech.</string> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>embedInSysTrayCheckBox</cstring> </property> @@ -83,16 +83,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -108,14 +108,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>showMainWindowOnStartupCheckBox</cstring> </property> @@ -131,9 +131,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5_2</cstring> + <cstring>tqlayout5_2</cstring> </property> <hbox> <property name="name"> @@ -149,14 +149,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>autoexitMgrCheckBox</cstring> </property> @@ -172,7 +172,7 @@ </widget> </hbox> </widget> - <widget class="QCheckBox" row="4" column="0" rowspan="1" colspan="2"> + <widget class="TQCheckBox" row="4" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>autostartMgrCheckBox</cstring> </property> @@ -188,7 +188,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -284,9 +284,9 @@ <string>This is a list of all the configured Talkers. A Talker is a speech synthesizer that has been configured with a language, voice, gender, speaking rate, and volume. Talkers higher in the list have higher priority. The topmost Talker will be used when no talker attributes have been specified by an application.</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -315,7 +315,7 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>higherTalkerPriorityButton</cstring> </property> @@ -331,7 +331,7 @@ <string>U&p</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>lowerTalkerPriorityButton</cstring> </property> @@ -407,7 +407,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -418,7 +418,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -429,7 +429,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="1" column="0"> + <widget class="TQGroupBox" row="1" column="0"> <property name="name"> <cstring>notifyGroup</cstring> </property> @@ -493,15 +493,15 @@ <string>This is a list of configured application events and actions to be taken when received. The "default" event governs all events not specifically configured.</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout21</cstring> + <cstring>tqlayout21</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>notifyPresentLabel</cstring> </property> @@ -523,7 +523,7 @@ <string>Applies only to the default event. Does not affect application-specific events. Only events that display in the manner which you select will be spoken.</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <property name="name"> <cstring>notifyPresentComboBox</cstring> </property> @@ -533,15 +533,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout28</cstring> + <cstring>tqlayout28</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>notifyAddButton</cstring> </property> @@ -555,7 +555,7 @@ <string>Click to configure notification for a specific application event.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>notifyRemoveButton</cstring> </property> @@ -576,14 +576,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>152</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>notifyClearButton</cstring> </property> @@ -594,7 +594,7 @@ <string>Removes all the application specific events. The default event remains.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>notifyLoadButton</cstring> </property> @@ -605,7 +605,7 @@ <string>Click to read configured notification events from a file.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>notifySaveButton</cstring> </property> @@ -618,7 +618,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>notifyExceptionActionLayout</cstring> </property> @@ -626,7 +626,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>notifyTestButton</cstring> </property> @@ -640,7 +640,7 @@ <string>Click this button to test the notification. A sample message will be spoken. Note: The Text-to-Speech system must be enabled.</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>notifyActionLabel</cstring> </property> @@ -662,7 +662,7 @@ <string><qt>Specifies how KTTS should speak the event when received. If you select "Speak custom text", enter the text in the box. You may use the following substitution strings in the text:<dl><dt>%e</dt><dd>Name of the event</dd><dt>%a</dt><dd>Application that sent the event</dd><dt>%m</dt><dd>The message sent by the application</dd></dl></qt></string> </property> </widget> - <widget class="QLineEdit" row="0" column="3"> + <widget class="TQLineEdit" row="0" column="3"> <property name="name"> <cstring>notifyMsgLineEdit</cstring> </property> @@ -670,7 +670,7 @@ <string><qt>Specifies how KTTS should speak the event when received. If you select "Speak custom text", enter the text in the box. You may use the following substitution strings in the text:<dl><dt>%e</dt><dd>Name of the event</dd><dt>%a</dt><dd>Application that sent the event</dd><dt>%m</dt><dd>The message sent by the application</dd></dl></qt></string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>notifyActionComboBox</cstring> </property> @@ -688,15 +688,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout19_2</cstring> + <cstring>tqlayout19_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>notifyTalkerLabel</cstring> </property> @@ -751,15 +751,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>notifyEnableCheckBox</cstring> </property> @@ -780,14 +780,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>notifyExcludeEventsWithSoundCheckBox</cstring> </property> @@ -805,7 +805,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -816,9 +816,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> @@ -846,9 +846,9 @@ <string>This is a list of all the configured Filters. Filters higher in the list are applied first. Filters modify text before it is spoken. They can be used to substitute for mispronounced words, transform XML from one form to another, or change the default Talker to be used for speech output.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9_2</cstring> + <cstring>tqlayout9_2</cstring> </property> <vbox> <property name="name"> @@ -877,7 +877,7 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>higherFilterPriorityButton</cstring> </property> @@ -896,7 +896,7 @@ <string>Click to move selected filter up in the list. Filters higher in the list are applied first.</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>lowerFilterPriorityButton</cstring> </property> @@ -975,7 +975,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>20</height> @@ -986,9 +986,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> @@ -1016,15 +1016,15 @@ <string>This is a list of all the configured Sentence Boundary Detector (SBD) Filters. SBDs break long text jobs up into sentences, which reduces the time before a job begins speaking, and permits you to advance or rewind through a job. SBDs are applied in the order listed (top to bottom) after all the normal filters at the top of this screen have been applied. Filtering stops when the first SBD modifies the text.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>sbdButton</cstring> </property> @@ -1053,7 +1053,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>11</height> @@ -1066,7 +1066,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1077,9 +1077,9 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <grid> <property name="name"> @@ -1116,7 +1116,7 @@ <comment>What's this text</comment> </property> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>textPostMsgCheck</cstring> </property> @@ -1130,7 +1130,7 @@ <string>Check the Post-message box and enter a Post-message, which will be spoken when a text job resumes after being interrupted by another message.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>textPreSndCheck</cstring> </property> @@ -1152,7 +1152,7 @@ <string>Check the Pre-sound box and choose a Pre-sound audio file, which will sound when a text job is interrupted by another message.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>textPreMsgCheck</cstring> </property> @@ -1188,7 +1188,7 @@ <string>Check the Post-sound and choose a Post-sound audio file, which will sound before a text job resumes after being interrupted by another message.</string> </property> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>textPostSndCheck</cstring> </property> @@ -1229,7 +1229,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>180</height> @@ -1238,7 +1238,7 @@ </spacer> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1249,15 +1249,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>keepAudioCheckBox</cstring> </property> @@ -1289,15 +1289,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>timeLabel</cstring> </property> @@ -1350,7 +1350,7 @@ <string>Sets the speed of speech. Slide the slider to the left to slow speech down; to the right to increase talking speed. Anything less than 75 percent is considered "slow", and anything greater than 125 percent is considered "fast". You cannot change the speed of MultiSyn voices.</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>timeSlider</cstring> </property> @@ -1391,7 +1391,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -1408,14 +1408,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>90</width> <height>20</height> </size> </property> </spacer> - <widget class="QButtonGroup" row="0" column="0"> + <widget class="TQButtonGroup" row="0" column="0"> <property name="name"> <cstring>audioButtonGroup</cstring> </property> @@ -1437,15 +1437,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>sinkLabel</cstring> </property> @@ -1480,15 +1480,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="1"> + <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>layout8_2_2</cstring> + <cstring>tqlayout8_2_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>akodeSinkLabel</cstring> </property> @@ -1523,7 +1523,7 @@ </widget> </hbox> </widget> - <widget class="QRadioButton" row="1" column="0"> + <widget class="TQRadioButton" row="1" column="0"> <property name="name"> <cstring>gstreamerRadioButton</cstring> </property> @@ -1540,7 +1540,7 @@ <string><p>Check to use the GStreamer audio output system. You must also select a <b>Sink</b> plugin.</p></string> </property> </widget> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>artsRadioButton</cstring> </property> @@ -1557,7 +1557,7 @@ <string>Check to use the KDE aRts system for audio output.</string> </property> </widget> - <widget class="QRadioButton" row="3" column="0"> + <widget class="TQRadioButton" row="3" column="0"> <property name="name"> <cstring>akodeRadioButton</cstring> </property> @@ -1580,15 +1580,15 @@ <string><p>Check to use aKode for audio output. You must also select a <b>Sink</b>.</p></string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout21</cstring> + <cstring>tqlayout21</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>alsaRadioButton</cstring> </property> @@ -1611,15 +1611,15 @@ <string>Check to use Advanced Linux Sound Architecture (ALSA) for audio output.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8_2</cstring> + <cstring>tqlayout8_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>pcmLabel</cstring> </property> @@ -1654,7 +1654,7 @@ </widget> </hbox> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>pcmCustom</cstring> </property> @@ -1888,13 +1888,13 @@ <include location="global" impldecl="in implementation">klocale.h</include> <include location="global" impldecl="in implementation">kdebug.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>configChanged()</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot access="private">slotConfigChanged()</slot> -</slots> -<layoutdefaults spacing="6" margin="6"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="6"/> <includehints> <includehint>kcmodule.h</includehint> <includehint>klistview.h</includehint> diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui.h b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui.h index 206524a..ff6ebb3 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui.h +++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp index 8a77c38..55a78d7 100644 --- a/kttsd/kcmkttsmgr/selectevent.cpp +++ b/kttsd/kcmkttsmgr/selectevent.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqcombobox.h> // KDE includes @@ -36,8 +36,8 @@ #include "utils.h" #include "selectevent.h" -SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQString& initEventSrc) - : SelectEventWidget(parent,name,fl) +SelectEvent::SelectEvent(TQWidget* tqparent, const char* name, WFlags fl, const TQString& initEventSrc) + : SelectEventWidget(tqparent,name,fl) { // Load list of event sources (applications). TQStringList fullpaths = @@ -61,13 +61,13 @@ SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQ if ( !relativePath.isEmpty() ) { KConfig* config = new KConfig(relativePath, true, false, "data"); - config->setGroup( TQString::fromLatin1("!Global!") ); - TQString icon = config->readEntry(TQString::fromLatin1("IconName"), - TQString::fromLatin1("misc")); - TQString description = config->readEntry( TQString::fromLatin1("Comment"), + config->setGroup( TQString::tqfromLatin1("!Global!") ); + TQString icon = config->readEntry(TQString::tqfromLatin1("IconName"), + TQString::tqfromLatin1("misc")); + TQString description = config->readEntry( TQString::tqfromLatin1("Comment"), i18n("No description available") ); delete config; - int index = relativePath.find( '/' ); + int index = relativePath.tqfind( '/' ); TQString appname; if ( index >= 0 ) appname = relativePath.left( index ); @@ -89,7 +89,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index) eventsListView->clear(); TQListViewItem* item = 0; TQString eventSrc = m_eventSrcNames[index]; - TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" ); + TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" ); KConfig* config = new KConfig( configFilename, true, false, "data" ); TQStringList eventNames = config->groupList(); uint eventNamesCount = eventNames.count(); @@ -99,8 +99,8 @@ void SelectEvent::slotEventSrcComboBox_activated(int index) if ( eventName != "!Global!" ) { config->setGroup( eventName ); - TQString eventDesc = config->readEntry( TQString::fromLatin1( "Comment" ), - config->readEntry( TQString::fromLatin1( "Name" ))); + TQString eventDesc = config->readEntry( TQString::tqfromLatin1( "Comment" ), + config->readEntry( TQString::tqfromLatin1( "Name" ))); if ( !item ) item = new KListViewItem( eventsListView, eventDesc, eventName ); else @@ -110,7 +110,7 @@ void SelectEvent::slotEventSrcComboBox_activated(int index) delete config; eventsListView->sort(); item = eventsListView->lastChild(); - TQString eventDesc = i18n("All other %1 events").arg(eventSrcComboBox->currentText()); + TQString eventDesc = i18n("All other %1 events").tqarg(eventSrcComboBox->currentText()); if ( !item ) item = new KListViewItem( eventsListView, eventDesc, "default" ); else @@ -129,18 +129,18 @@ TQString SelectEvent::getEvent() if ( item ) return item->text(1); else - return TQString::null; + return TQString(); } // returns e.g. "kwin/eventsrc" from a given path // "/opt/kde3/share/apps/kwin/eventsrc" TQString SelectEvent::makeRelative( const TQString& fullPath ) { - int slash = fullPath.findRev( '/' ) - 1; - slash = fullPath.findRev( '/', slash ); + int slash = fullPath.tqfindRev( '/' ) - 1; + slash = fullPath.tqfindRev( '/', slash ); if ( slash < 0 ) - return TQString::null; + return TQString(); return fullPath.mid( slash+1 ); } diff --git a/kttsd/kcmkttsmgr/selectevent.h b/kttsd/kcmkttsmgr/selectevent.h index 95d60f9..f7ce996 100644 --- a/kttsd/kcmkttsmgr/selectevent.h +++ b/kttsd/kcmkttsmgr/selectevent.h @@ -29,16 +29,17 @@ class SelectEvent : public SelectEventWidget { Q_OBJECT + TQ_OBJECT public: /** * Constructor. - * @param parent Inherited KDialog parameter. + * @param tqparent Inherited KDialog parameter. * @param name Inherited KDialog parameter. * @param initEventSrc Event source to start with. */ - SelectEvent(TQWidget* parent = 0, const char* name = 0, WFlags fl = 0, - const TQString& initEventSrc = TQString::null ); + SelectEvent(TQWidget* tqparent = 0, const char* name = 0, WFlags fl = 0, + const TQString& initEventSrc = TQString() ); /** * Destructor. diff --git a/kttsd/kcmkttsmgr/selecteventwidget.ui b/kttsd/kcmkttsmgr/selecteventwidget.ui index 13b91f1..ece6a71 100644 --- a/kttsd/kcmkttsmgr/selecteventwidget.ui +++ b/kttsd/kcmkttsmgr/selecteventwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SelectEventWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SelectEventWidget</cstring> </property> @@ -16,7 +16,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>eventSrcLabel</cstring> </property> @@ -27,7 +27,7 @@ <cstring>eventSrcComboBox</cstring> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <property name="name"> <cstring>eventSrcComboBox</cstring> </property> @@ -55,7 +55,7 @@ </widget> <customwidgets> </customwidgets> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klistview.h</includehint> </includehints> diff --git a/kttsd/kttsd/filtermgr.cpp b/kttsd/kttsd/filtermgr.cpp index 88dc6b0..0889143 100644 --- a/kttsd/kttsd/filtermgr.cpp +++ b/kttsd/kttsd/filtermgr.cpp @@ -37,8 +37,8 @@ /** * Constructor. */ -FilterMgr::FilterMgr( TQObject *parent, const char *name) : - KttsFilterProc(parent, name) +FilterMgr::FilterMgr( TQObject *tqparent, const char *name) : + KttsFilterProc(tqparent, name) { // kdDebug() << "FilterMgr::FilterMgr: Running" << endl; m_state = fsIdle; @@ -101,7 +101,7 @@ bool FilterMgr::init(KConfig *config, const TQString& /*configGroup*/) // and DesktopEntryName won't change. if (desktopEntryName.isEmpty()) { - TQString filterPlugInName = config->readEntry("PlugInName", TQString::null); + TQString filterPlugInName = config->readEntry("PlugInName", TQString()); // See if the translated name will untranslate. If not, well, sorry. desktopEntryName = FilterNameToDesktopEntryName(filterPlugInName); // Record the DesktopEntryName from now on. @@ -116,8 +116,8 @@ bool FilterMgr::init(KConfig *config, const TQString& /*configGroup*/) filterProc->init( config, groupName ); m_filterList.append( filterProc ); } - if (config->readEntry("DocType").contains("html") || - config->readEntry("RootElement").contains("html")) + if (config->readEntry("DocType").tqcontains("html") || + config->readEntry("RootElement").tqcontains("html")) m_supportsHTML = true; } } @@ -310,7 +310,7 @@ TQString FilterMgr::getOutput() void FilterMgr::ackFinished() { m_state = fsIdle; - m_text = TQString::null; + m_text = TQString(); } /** @@ -352,7 +352,7 @@ KttsFilterProc* FilterMgr::loadFilterPlugin(const TQString& desktopEntryName) // Find the plugin. KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin", - TQString("DesktopEntryName == '%1'").arg(desktopEntryName)); + TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName)); if (offers.count() == 1) { @@ -392,14 +392,14 @@ KttsFilterProc* FilterMgr::loadFilterPlugin(const TQString& desktopEntryName) * Uses KTrader to convert a translated Filter Plugin Name to DesktopEntryName. * @param name The translated plugin name. From Name= line in .desktop file. * @return DesktopEntryName. The name of the .desktop file (less .desktop). - * TQString::null if not found. + * TQString() if not found. */ TQString FilterMgr::FilterNameToDesktopEntryName(const TQString& name) { - if (name.isEmpty()) return TQString::null; + if (name.isEmpty()) return TQString(); KTrader::OfferList offers = KTrader::self()->query("KTTSD/FilterPlugin"); for (uint ndx = 0; ndx < offers.count(); ++ndx) if (offers[ndx]->name() == name) return offers[ndx]->desktopEntryName(); - return TQString::null; + return TQString(); } diff --git a/kttsd/kttsd/filtermgr.h b/kttsd/kttsd/filtermgr.h index 2a8ea23..539329b 100644 --- a/kttsd/kttsd/filtermgr.h +++ b/kttsd/kttsd/filtermgr.h @@ -26,7 +26,7 @@ #ifndef _FILTERMGR_H_ #define _FILTERMGR_H_ -// Qt includes. +// TQt includes. #include <tqptrlist.h> // KTTS includes. @@ -40,12 +40,13 @@ typedef TQPtrList<KttsFilterProc> FilterList; class FilterMgr : public KttsFilterProc { Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - FilterMgr(TQObject *parent = 0, const char *name = 0); + FilterMgr(TQObject *tqparent = 0, const char *name = 0); /** * Destructor. @@ -167,7 +168,7 @@ class FilterMgr : public KttsFilterProc // Uses KTrader to convert a translated Filter Plugin Name to DesktopEntryName. // @param name The translated plugin name. From Name= line in .desktop file. // @return DesktopEntryName. The name of the .desktop file (less .desktop). - // TQString::null if not found. + // TQString() if not found. TQString FilterNameToDesktopEntryName(const TQString& name); // List of filters. diff --git a/kttsd/kttsd/kttsd.cpp b/kttsd/kttsd/kttsd.cpp index 5a643a1..c546100 100644 --- a/kttsd/kttsd/kttsd.cpp +++ b/kttsd/kttsd/kttsd.cpp @@ -18,7 +18,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqcstring.h> #include <tqclipboard.h> #include <tqtextstream.h> @@ -49,9 +49,9 @@ * Note that most of the real tts work occurs in Speaker. */ -KTTSD::KTTSD(const TQCString& objId, TQObject *parent, const char *name) : +KTTSD::KTTSD(const TQCString& objId, TQObject *tqparent, const char *name) : DCOPObject(objId), - TQObject(parent, name) + TQObject(tqparent, name) { // kdDebug() << "KTTSD::KTTSD Running" << endl; m_speaker = 0; @@ -479,7 +479,7 @@ uint KTTSD::getTextJobCount() */ TQString KTTSD::getTextJobNumbers() { - if (!m_speaker) return TQString::null; + if (!m_speaker) return TQString(); return m_speechData->getTextJobNumbers(); } @@ -540,7 +540,7 @@ TQByteArray KTTSD::getTextJobInfo(const uint jobNum /*=0*/) */ TQString KTTSD::talkerCodeToTalkerId(const TQString& talkerCode) { - if (!m_talkerMgr) return TQString::null; + if (!m_talkerMgr) return TQString(); return m_talkerMgr->talkerCodeToTalkerId(fixNullString(talkerCode)); } @@ -728,7 +728,7 @@ void KTTSD::changeTextTalker(const TQString &talker, uint jobNum) */ TQString KTTSD::userDefaultTalker() { - if (!m_talkerMgr) return TQString::null; + if (!m_talkerMgr) return TQString(); return m_talkerMgr->userDefaultTalker(); } @@ -790,7 +790,7 @@ uint KTTSD::moveRelTextSentence(const int n, const uint jobNum /*=0*/) void KTTSD::speakClipboard() { // Get the clipboard object. - QClipboard *cb = kapp->clipboard(); + TQClipboard *cb = kapp->tqclipboard(); // Copy text from the clipboard. TQString text = cb->text(); @@ -893,20 +893,20 @@ void KTTSD::notificationSignal( const TQString& event, const TQString& fromApp, TQString msg; TQString talker; // Check for app-specific action. - if ( m_speechData->notifyAppMap.contains( fromApp ) ) + if ( m_speechData->notifyAppMap.tqcontains( fromApp ) ) { NotifyEventMap notifyEventMap = m_speechData->notifyAppMap[ fromApp ]; - if ( notifyEventMap.contains( event ) ) + if ( notifyEventMap.tqcontains( event ) ) { found = true; notifyOptions = notifyEventMap[ event ]; } else { // Check for app-specific default. - if ( notifyEventMap.contains( "default" ) ) + if ( notifyEventMap.tqcontains( "default" ) ) { found = true; notifyOptions = notifyEventMap[ "default" ]; - notifyOptions.eventName = TQString::null; + notifyOptions.eventName = TQString(); } } } @@ -965,14 +965,14 @@ void KTTSD::notificationSignal( const TQString& event, const TQString& fromApp, break; case NotifyAction::SpeakCustom: msg = notifyOptions.customMsg; - msg.replace( "%a", fromApp ); - msg.replace( "%m", text ); - if ( msg.contains( "%e" ) ) + msg.tqreplace( "%a", fromApp ); + msg.tqreplace( "%m", text ); + if ( msg.tqcontains( "%e" ) ) { if ( notifyOptions.eventName.isEmpty() ) - msg.replace( "%e", NotifyEvent::getEventName( fromApp, event ) ); + msg.tqreplace( "%e", NotifyEvent::getEventName( fromApp, event ) ); else - msg.replace( "%e", notifyOptions.eventName ); + msg.tqreplace( "%e", notifyOptions.eventName ); } break; } @@ -1084,21 +1084,21 @@ uint KTTSD::applyDefaultJobNum(const uint jobNum) /* * Fixes a string argument passed in via dcop. -* If NULL or "0" return TQString::null. +* If NULL or "0" return TQString(). */ TQString KTTSD::fixNullString(const TQString &talker) const { - if (!talker) return TQString::null; - if (talker == "0") return TQString::null; + if (!talker) return TQString(); + if (talker == "0") return TQString(); return talker; } // kspeech is obsolete. Applications should use KSpeech instead. // Constructor. -kspeech::kspeech(const TQCString& objId, TQObject *parent, const char *name) : +kspeech::kspeech(const TQCString& objId, TQObject *tqparent, const char *name) : DCOPObject(objId), - TQObject(parent, name), + TQObject(tqparent, name), m_kttsd("KSpeech") { } diff --git a/kttsd/kttsd/kttsd.h b/kttsd/kttsd/kttsd.h index 075383b..c082f1d 100644 --- a/kttsd/kttsd/kttsd.h +++ b/kttsd/kttsd/kttsd.h @@ -39,6 +39,7 @@ class KTTSD : public TQObject, virtual public KSpeech { Q_OBJECT +// TQ_OBJECT K_DCOP public: @@ -48,7 +49,7 @@ class KTTSD : public TQObject, virtual public KSpeech * Create objects, speechData and speaker. * Start thread */ - KTTSD(const TQCString& objId, TQObject *parent=0, const char *name=0); + KTTSD(const TQCString& objId, TQObject *tqparent=0, const char *name=0); /** * Destructor. @@ -608,7 +609,7 @@ class KTTSD : public TQObject, virtual public KSpeech /* * Fixes a talker argument passed in via dcop. - * If NULL or "0" return TQString::null. + * If NULL or "0" return TQString(). */ TQString fixNullString(const TQString &talker) const; @@ -632,11 +633,12 @@ class KTTSD : public TQObject, virtual public KSpeech class kspeech : public TQObject, virtual public KSpeech { Q_OBJECT +// TQ_OBJECT K_DCOP public: // Constructor. - kspeech(const TQCString& objId, TQObject *parent=0, const char *name=0); + kspeech(const TQCString& objId, TQObject *tqparent=0, const char *name=0); // Destructor. ~kspeech(); diff --git a/kttsd/kttsd/speaker.cpp b/kttsd/kttsd/speaker.cpp index 42fa39e..1434ab9 100644 --- a/kttsd/kttsd/speaker.cpp +++ b/kttsd/kttsd/speaker.cpp @@ -19,7 +19,7 @@ * * ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqfile.h> #include <tqtimer.h> #include <tqdir.h> @@ -77,7 +77,7 @@ * You might have to wait for the plugin to complete before asking it * to perform the next operation, but in the meantime, there might be * other useful work that can be performed. -* - In no case allow the main thread Qt event loop to block. +* - In no case allow the main thread TQt event loop to block. * - Plugins that do not have asynchronous support are wrapped in the * ThreadedPlugin class, which attempts to make them as asynchronous as * it can, but there are limits. @@ -107,8 +107,8 @@ * Loads plugins. */ Speaker::Speaker( SpeechData*speechData, TalkerMgr* talkerMgr, - TQObject *parent, const char *name) : - TQObject(parent, name), + TQObject *tqparent, const char *name) : + TQObject(tqparent, name), m_speechData(speechData), m_talkerMgr(talkerMgr) { @@ -806,7 +806,7 @@ TQString Speaker::uttStateToStr(uttState state) case usPreempted: return "usPreempted"; case usFinished: return "usFinished"; } - return TQString::null; + return TQString(); } /** @@ -829,7 +829,7 @@ TQString Speaker::uttTypeToStr(uttType utType) case utStartOfJob: return "utStartOfJob"; case utEndOfJob: return "utEndOfJob"; } - return TQString::null; + return TQString(); } /** @@ -846,7 +846,7 @@ TQString Speaker::pluginStateToStr(pluginState state) case psSynthing: return "psSynthing"; case psFinished: return "psFinished"; } - return TQString::null; + return TQString(); } /** @@ -864,7 +864,7 @@ TQString Speaker::jobStateToStr(int state) case KSpeech::jsPaused: return "jsPaused"; case KSpeech::jsFinished: return "jsFinished"; } - return TQString::null; + return TQString(); } /** @@ -926,7 +926,7 @@ bool Speaker::isSsml(const TQString &text) } /** - * Determines the initial state of an utterance. If the utterance contains + * Determines the initial state of an utterance. If the utterance tqcontains * SSML, the state is set to usWaitingTransform. Otherwise, if the plugin * supports async synthesis, sets to usWaitingSynth, otherwise usWaitingSay. * If an utterance has already been transformed, usWaitingTransform is @@ -1019,7 +1019,7 @@ bool Speaker::getNextUtterance() utt->state = usNone; utt->audioPlayer = 0; utt->audioStretcher = 0; - utt->audioUrl = TQString::null; + utt->audioUrl = TQString(); utt->plugin = m_talkerMgr->talkerToPlugin(utt->sentence->talker); // Save some time by setting initial state now. setInitialUtteranceState(*utt); @@ -1079,7 +1079,7 @@ bool Speaker::getNextUtterance() { Utt intrUtt; intrUtt.sentence = new mlText; - intrUtt.sentence->text = TQString::null; + intrUtt.sentence->text = TQString(); intrUtt.sentence->talker = utt->sentence->talker; intrUtt.sentence->appId = utt->sentence->appId; intrUtt.sentence->jobNum = utt->sentence->jobNum; @@ -1099,11 +1099,11 @@ bool Speaker::getNextUtterance() intrUtt.sentence = new mlText; intrUtt.sentence->text = m_speechData->textPreMsg; // Interruptions are spoken using default Talker. - intrUtt.sentence->talker = TQString::null; + intrUtt.sentence->talker = TQString(); intrUtt.sentence->appId = utt->sentence->appId; intrUtt.sentence->jobNum = utt->sentence->jobNum; intrUtt.sentence->seq = 0; - intrUtt.audioUrl = TQString::null; + intrUtt.audioUrl = TQString(); intrUtt.audioPlayer = 0; intrUtt.utType = utInterruptMsg; intrUtt.isSSML = isSsml(intrUtt.sentence->text); @@ -1125,7 +1125,7 @@ bool Speaker::getNextUtterance() { Utt resUtt; resUtt.sentence = new mlText; - resUtt.sentence->text = TQString::null; + resUtt.sentence->text = TQString(); resUtt.sentence->talker = utt->sentence->talker; resUtt.sentence->appId = utt->sentence->appId; resUtt.sentence->jobNum = utt->sentence->jobNum; @@ -1144,11 +1144,11 @@ bool Speaker::getNextUtterance() Utt resUtt; resUtt.sentence = new mlText; resUtt.sentence->text = m_speechData->textPostMsg; - resUtt.sentence->talker = TQString::null; + resUtt.sentence->talker = TQString(); resUtt.sentence->appId = utt->sentence->appId; resUtt.sentence->jobNum = utt->sentence->jobNum; resUtt.sentence->seq = 0; - resUtt.audioUrl = TQString::null; + resUtt.audioUrl = TQString(); resUtt.audioPlayer = 0; resUtt.utType = utResumeMsg; resUtt.isSSML = isSsml(resUtt.sentence->text); @@ -1173,12 +1173,12 @@ bool Speaker::getNextUtterance() { Utt jobUtt; jobUtt.sentence = new mlText; - jobUtt.sentence->text = TQString::null; - jobUtt.sentence->talker = TQString::null; + jobUtt.sentence->text = TQString(); + jobUtt.sentence->talker = TQString(); jobUtt.sentence->appId = m_lastAppId; jobUtt.sentence->jobNum = m_lastJobNum; jobUtt.sentence->seq = 0; - jobUtt.audioUrl = TQString::null; + jobUtt.audioUrl = TQString(); jobUtt.utType = utEndOfJob; jobUtt.isSSML = false; jobUtt.plugin = 0; @@ -1194,12 +1194,12 @@ bool Speaker::getNextUtterance() { Utt jobUtt; jobUtt.sentence = new mlText; - jobUtt.sentence->text = TQString::null; - jobUtt.sentence->talker = TQString::null; + jobUtt.sentence->text = TQString(); + jobUtt.sentence->talker = TQString(); jobUtt.sentence->appId = m_lastAppId; jobUtt.sentence->jobNum = m_lastJobNum; jobUtt.sentence->seq = utt->sentence->seq; - jobUtt.audioUrl = TQString::null; + jobUtt.audioUrl = TQString(); jobUtt.utType = utStartOfJob; jobUtt.isSSML = false; jobUtt.plugin = 0; @@ -1220,12 +1220,12 @@ bool Speaker::getNextUtterance() { Utt jobUtt; jobUtt.sentence = new mlText; - jobUtt.sentence->text = TQString::null; - jobUtt.sentence->talker = TQString::null; + jobUtt.sentence->text = TQString(); + jobUtt.sentence->talker = TQString(); jobUtt.sentence->appId = m_lastAppId; jobUtt.sentence->jobNum = m_lastJobNum; jobUtt.sentence->seq = 0; - jobUtt.audioUrl = TQString::null; + jobUtt.audioUrl = TQString(); jobUtt.utType = utEndOfJob; jobUtt.isSSML = false; jobUtt.plugin = 0; @@ -1316,7 +1316,7 @@ uttIterator Speaker::deleteUtterance(uttIterator it) TQCString jobStr; jobStr.sprintf("%08i", it->sentence->jobNum); TQString dest = m_speechData->keepAudioPath + "/kttsd-" + - TQString("%1-%2").arg(jobStr).arg(seqStr) + ".wav"; + TQString("%1-%2").tqarg(jobStr.data()).tqarg(seqStr.data()) + ".wav"; TQFile::remove(dest); TQDir d; d.rename(it->audioUrl, dest); @@ -1418,7 +1418,7 @@ bool Speaker::startPlayingUtterance(uttIterator it) (m_speechData->getTextJobState(it->sentence->jobNum) != KSpeech::jsPaused)) { // kdDebug() << "Speaker::startPlayingUtterance: resuming play" << endl; - it->audioPlayer->startPlay(TQString::null); // resume + it->audioPlayer->startPlay(TQString()); // resume it->state = usPlaying; if (!m_timer->start(timerInterval, FALSE)) kdDebug() << "Speaker::startPlayingUtterance: timer.start failed" << endl; @@ -1431,7 +1431,7 @@ bool Speaker::startPlayingUtterance(uttIterator it) { // Preempted playback automatically resumes. // Note: Must call stop(), even if player not currently playing. Why? - it->audioPlayer->startPlay(TQString::null); // resume + it->audioPlayer->startPlay(TQString()); // resume it->state = usPlaying; if (!m_timer->start(timerInterval, FALSE)) kdDebug() << "Speaker::startPlayingUtterance: timer.start failed" << endl; @@ -1541,7 +1541,7 @@ Player* Speaker::createPlayerObject() } } KTrader::OfferList offers = KTrader::self()->query( - "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").arg(plugInName)); + "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").tqarg(plugInName)); if(offers.count() == 1) { diff --git a/kttsd/kttsd/speaker.h b/kttsd/kttsd/speaker.h index 6c81ada..04e2190 100644 --- a/kttsd/kttsd/speaker.h +++ b/kttsd/kttsd/speaker.h @@ -23,7 +23,7 @@ #ifndef _SPEAKER_H_ #define _SPEAKER_H_ -// Qt includes. +// TQt includes. #include <tqobject.h> #include <tqvaluevector.h> #include <tqevent.h> @@ -109,8 +109,9 @@ const int timerInterval = 500; * This class is in charge of getting the messages, warnings and text from * the queue and call the plug ins function to actually speak the texts. */ -class Speaker : public QObject{ +class Speaker : public TQObject{ Q_OBJECT + TQ_OBJECT public: /** @@ -118,7 +119,7 @@ class Speaker : public QObject{ * Calls load plug ins */ Speaker(SpeechData* speechData, TalkerMgr* talkerMgr, - TQObject *parent = 0, const char *name = 0); + TQObject *tqparent = 0, const char *name = 0); /** * Destructor @@ -429,7 +430,7 @@ class Speaker : public QObject{ bool isSsml(const TQString &text); /** - * Determines the initial state of an utterance. If the utterance contains + * Determines the initial state of an utterance. If the utterance tqcontains * SSML, the state is set to usWaitingTransform. Otherwise, if the plugin * supports async synthesis, sets to usWaitingSynth, otherwise usWaitingSay. * If an utterance has already been transformed, usWaitingTransform is diff --git a/kttsd/kttsd/speechdata.cpp b/kttsd/kttsd/speechdata.cpp index 1c8f90f..e3793a5 100644 --- a/kttsd/kttsd/speechdata.cpp +++ b/kttsd/kttsd/speechdata.cpp @@ -25,7 +25,7 @@ // C++ includes. #include <stdlib.h> -// Qt includes. +// TQt includes. #include <tqregexp.h> #include <tqpair.h> #include <tqvaluelist.h> @@ -156,8 +156,8 @@ void SpeechData::loadNotifyEventsFromFile( const TQString& filename, bool clear) { notifyDefaultPresent = NotifyPresent::Passive; notifyDefaultOptions.action = NotifyAction::SpeakMsg; - notifyDefaultOptions.talker = TQString::null; - notifyDefaultOptions.customMsg = TQString::null; + notifyDefaultOptions.talker = TQString(); + notifyDefaultOptions.customMsg = TQString(); notifyAppMap.clear(); } @@ -195,7 +195,7 @@ void SpeechData::loadNotifyEventsFromFile( const TQString& filename, bool clear) notifyEventMap[ event ] = notifyOptions; notifyAppMap[ eventSrc ] = notifyEventMap; } else { - notifyOptions.eventName = TQString::null; + notifyOptions.eventName = TQString(); notifyDefaultPresent = NotifyPresent::present( event ); notifyDefaultOptions = notifyOptions; } @@ -423,24 +423,24 @@ TQStringList SpeechData::parseText(const TQString &text, const TQCString &appId } // See if app has specified a custom sentence delimiter and use it, otherwise use default. TQRegExp sentenceDelimiter; - if (sentenceDelimiters.find(appId) != sentenceDelimiters.end()) + if (sentenceDelimiters.tqfind(appId) != sentenceDelimiters.end()) sentenceDelimiter = TQRegExp(sentenceDelimiters[appId]); else sentenceDelimiter = TQRegExp("([\\.\\?\\!\\:\\;]\\s)|(\\n *\\n)"); TQString temp = text; // Replace spaces, tabs, and formfeeds with a single space. - temp.replace(TQRegExp("[ \\t\\f]+"), " "); + temp.tqreplace(TQRegExp("[ \\t\\f]+"), " "); // Replace sentence delimiters with tab. - temp.replace(sentenceDelimiter, "\\1\t"); + temp.tqreplace(sentenceDelimiter, "\\1\t"); // Replace remaining newlines with spaces. - temp.replace("\n"," "); - temp.replace("\r"," "); + temp.tqreplace("\n"," "); + temp.tqreplace("\r"," "); // Remove leading spaces. - temp.replace(TQRegExp("\\t +"), "\t"); + temp.tqreplace(TQRegExp("\\t +"), "\t"); // Remove trailing spaces. - temp.replace(TQRegExp(" +\\t"), "\t"); + temp.tqreplace(TQRegExp(" +\\t"), "\t"); // Remove blank lines. - temp.replace(TQRegExp("\t\t+"),"\t"); + temp.tqreplace(TQRegExp("\t\t+"),"\t"); // Split into sentences. TQStringList tempList = TQStringList::split("\t", temp, false); @@ -695,7 +695,7 @@ int SpeechData::getJobPartNumFromSeq(const mlJob& job, const int seq) void SpeechData::deleteExpiredJobs(const uint finishedJobNum) { // Save current pointer. - typedef QPair<TQCString, uint> removedJob; + typedef TQPair<TQCString, uint> removedJob; typedef TQValueList<removedJob> removedJobsList; removedJobsList removedJobs; // Walk through jobs and delete any other finished jobs. @@ -1032,7 +1032,7 @@ void SpeechData::moveTextLater(const uint jobNum) if (job) { // Get index of the job. - uint index = textJobs.findRef(job); + uint index = textJobs.tqfindRef(job); // Move job down one position in the queue. // kdDebug() << "In SpeechData::moveTextLater, moving jobNum " << movedJobNum << endl; if (textJobs.insert(index + 2, job)) textJobs.take(index); @@ -1149,7 +1149,7 @@ void SpeechData::startJobFiltering(mlJob* job, const TQString& text, bool noSBD) // Get TalkerCode structure of closest matching Talker. pooledFilterMgr->talkerCode = m_talkerMgr->talkerToTalkerCode(job->talker); // Pass Sentence Boundary regular expression (if app overrode default); - if (sentenceDelimiters.find(job->appId) != sentenceDelimiters.end()) + if (sentenceDelimiters.tqfind(job->appId) != sentenceDelimiters.end()) pooledFilterMgr->filterMgr->setSbRegExp(sentenceDelimiters[job->appId]); pooledFilterMgr->filterMgr->asyncConvert(text, pooledFilterMgr->talkerCode, job->appId); } diff --git a/kttsd/kttsd/speechdata.h b/kttsd/kttsd/speechdata.h index 5f5b92a..73ee03b 100644 --- a/kttsd/kttsd/speechdata.h +++ b/kttsd/kttsd/speechdata.h @@ -25,7 +25,7 @@ #ifndef _SPEECHDATA_H_ #define _SPEECHDATA_H_ -// Qt includes. +// TQt includes. #include <tqptrqueue.h> #include <tqptrlist.h> #include <tqstring.h> @@ -110,6 +110,7 @@ typedef TQMap<TQString, NotifyEventMap> NotifyAppMap; */ class SpeechData : public TQObject { Q_OBJECT + TQ_OBJECT public: /** diff --git a/kttsd/kttsd/ssmlconvert.cpp b/kttsd/kttsd/ssmlconvert.cpp index d33eaf3..5f37af4 100644 --- a/kttsd/kttsd/ssmlconvert.cpp +++ b/kttsd/kttsd/ssmlconvert.cpp @@ -19,7 +19,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqstringlist.h> #include <tqdom.h> @@ -66,10 +66,10 @@ void SSMLConvert::setTalkers(const TQStringList &talkers) { TQString SSMLConvert::extractTalker(const TQString &talkercode) { TQString t = talkercode.section("synthesizer=", 1, 1); t = t.section('"', 1, 1); - if(t.contains("flite")) + if(t.tqcontains("flite")) return "flite"; else - return t.left(t.find(" ")).lower(); + return t.left(t.tqfind(" ")).lower(); } /** @@ -101,7 +101,7 @@ TQString SSMLConvert::extractTalker(const TQString &talkercode) { * of the how the talker is chosen, meaning that you don't lose some features of the talker if this * search doesn't encompass them. * -* QDom is the item of choice for the matching. Just walk the tree.. +* TQDom is the item of choice for the matching. Just walk the tree.. */ TQString SSMLConvert::appropriateTalker(const TQString &text) const { TQDomDocument ssml; @@ -113,7 +113,7 @@ TQString SSMLConvert::appropriateTalker(const TQString &text) const { TQDomElement root = ssml.documentElement(); if(root.tagName() != "speak") { // Not SSML. - return TQString::null; + return TQString(); } /** @@ -132,7 +132,7 @@ TQString SSMLConvert::appropriateTalker(const TQString &text) const { TQString lang = root.attribute("xml:lang"); kdDebug() << "SSMLConvert::appropriateTalker: xml:lang found (" << lang << ")" << endl; /// If it is set to en*, then match all english speakers. They all sound the same anyways. - if(lang.contains("en-")) { + if(lang.tqcontains("en-")) { kdDebug() << "SSMLConvert::appropriateTalker: English" << endl; lang = "en"; } @@ -273,7 +273,7 @@ TQString SSMLConvert::getOutput() if(!readfile.open(IO_ReadOnly)) { /// uhh yeah... Issues writing to the SSML file. kdDebug() << "SSMLConvert::slotProcessExited: Could not read file " << m_outFilename << endl; - return TQString::null; + return TQString(); } TQTextStream rstream(&readfile); TQString convertedData = rstream.read(); @@ -283,9 +283,9 @@ TQString SSMLConvert::getOutput() // Clean up. TQFile::remove(m_inFilename); - m_inFilename = TQString::null; + m_inFilename = TQString(); TQFile::remove(m_outFilename); - m_outFilename = TQString::null; + m_outFilename = TQString(); // Ready for another transform. m_state = tsIdle; diff --git a/kttsd/kttsd/ssmlconvert.h b/kttsd/kttsd/ssmlconvert.h index dd48db3..2fd18bd 100644 --- a/kttsd/kttsd/ssmlconvert.h +++ b/kttsd/kttsd/ssmlconvert.h @@ -30,7 +30,7 @@ * by the talker. */ -// Qt includes +// TQt includes #include <tqobject.h> #include <tqstringlist.h> @@ -39,6 +39,7 @@ class TQString; class SSMLConvert : public TQObject { Q_OBJECT + TQ_OBJECT public: /** Constructors */ SSMLConvert(); diff --git a/kttsd/kttsd/talkermgr.cpp b/kttsd/kttsd/talkermgr.cpp index f10281c..b25929c 100644 --- a/kttsd/kttsd/talkermgr.cpp +++ b/kttsd/kttsd/talkermgr.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. // KDE includes. #include <kdebug.h> @@ -37,8 +37,8 @@ /** * Constructor. */ -TalkerMgr::TalkerMgr(TQObject *parent, const char *name) : - TQObject( parent, name ) +TalkerMgr::TalkerMgr(TQObject *tqparent, const char *name) : + TQObject( tqparent, name ) { m_loadedPlugIns.setAutoDelete(true); } @@ -82,7 +82,7 @@ int TalkerMgr::loadPlugIns(KConfig* config) config->setGroup("Talker_" + talkerID); // Get the DesktopEntryName of the plugin we will try to load. - TQString desktopEntryName = config->readEntry("DesktopEntryName", TQString::null); + TQString desktopEntryName = config->readEntry("DesktopEntryName", TQString()); // If a DesktopEntryName is not in the config file, it was configured before // we started using them, when we stored translated plugin names instead. @@ -91,7 +91,7 @@ int TalkerMgr::loadPlugIns(KConfig* config) // and DesktopEntryName won't change. if (desktopEntryName.isEmpty()) { - TQString synthName = config->readEntry("PlugIn", TQString::null); + TQString synthName = config->readEntry("PlugIn", TQString()); // See if the translated name will untranslate. If not, well, sorry. desktopEntryName = TalkerCode::TalkerNameToDesktopEntryName(synthName); // Record the DesktopEntryName from now on. @@ -99,7 +99,7 @@ int TalkerMgr::loadPlugIns(KConfig* config) } // Get the talker code. - TQString talkerCode = config->readEntry("TalkerCode", TQString::null); + TQString talkerCode = config->readEntry("TalkerCode", TQString()); // Normalize the talker code. TQString fullLanguageCode; @@ -107,7 +107,7 @@ int TalkerMgr::loadPlugIns(KConfig* config) // Find the KTTSD SynthPlugin. KTrader::OfferList offers = KTrader::self()->query( - "KTTSD/SynthPlugin", TQString("DesktopEntryName == '%1'").arg(desktopEntryName)); + "KTTSD/SynthPlugin", TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName)); if(offers.count() > 1){ ++bad; @@ -134,7 +134,7 @@ int TalkerMgr::loadPlugIns(KConfig* config) } else { // Synchronous plugins are run in a separate thread. // Init will start the thread and it will immediately go to sleep. - TQString threadedPlugInName = TQString::fromLatin1("threaded") + desktopEntryName; + TQString threadedPlugInName = TQString::tqfromLatin1("threaded") + desktopEntryName; ThreadedPlugIn* speechThread = new ThreadedPlugIn(speech, this, threadedPlugInName.latin1()); speechThread->init(config, "Talker_" + talkerCode); @@ -205,7 +205,7 @@ int TalkerMgr::talkerToPluginIndex(const TQString& talker) const { // kdDebug() << "TalkerMgr::talkerToPluginIndex: matching talker " << talker << " to closest matching plugin." << endl; // If we have a cached match, return that. - if (m_talkerToPlugInCache.contains(talker)) + if (m_talkerToPlugInCache.tqcontains(talker)) return m_talkerToPlugInCache[talker]; else { @@ -223,7 +223,7 @@ int TalkerMgr::talkerToPluginIndex(const TQString& talker) const * If a plugin has not been loaded to match the talker, returns the default * plugin. * - * TODO: When picking a talker, %KTTSD will automatically determine if text contains + * TODO: When picking a talker, %KTTSD will automatically determine if text tqcontains * markup and pick a talker that supports that markup, if available. This * overrides all other attributes, i.e, it is treated as an automatic "top priority" * attribute. @@ -244,7 +244,7 @@ PlugInProc* TalkerMgr::talkerToPlugin(const TQString& talker) const * * The returned TalkerCode is a copy and should be destroyed by caller. * - * TODO: When picking a talker, %KTTSD will automatically determine if text contains + * TODO: When picking a talker, %KTTSD will automatically determine if text tqcontains * markup and pick a talker that supports that markup, if available. This * overrides all other attributes, i.e, it is treated as an automatic "top priority" * attribute. @@ -325,7 +325,7 @@ bool TalkerMgr::autoconfigureTalker(const TQString& langCode, KConfig* config) { // See if this plugin supports the desired language. TQStringList languageCodes = offers[i]->property("X-KDE-Languages").toStringList(); - if (languageCodes.contains(languageCode)) + if (languageCodes.tqcontains(languageCode)) { TQString desktopEntryName = offers[i]->desktopEntryName(); diff --git a/kttsd/kttsd/talkermgr.h b/kttsd/kttsd/talkermgr.h index 52ddc4d..1028990 100644 --- a/kttsd/kttsd/talkermgr.h +++ b/kttsd/kttsd/talkermgr.h @@ -24,7 +24,7 @@ #ifndef _TALKERMGR_H_ #define _TALKERMGR_H_ -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqstringlist.h> #include <tqmap.h> @@ -34,14 +34,14 @@ #include "talkercode.h" #include "pluginproc.h" -class TalkerMgr: public QObject +class TalkerMgr: public TQObject { public: /** * Constructor. */ - TalkerMgr(TQObject *parent = 0, const char *name = 0); + TalkerMgr(TQObject *tqparent = 0, const char *name = 0); /** * Destructor. @@ -95,7 +95,7 @@ public: * * The returned TalkerCode is a copy and should be destroyed by caller. * - * TODO: When picking a talker, %KTTSD will automatically determine if text contains + * TODO: When picking a talker, %KTTSD will automatically determine if text tqcontains * markup and pick a talker that supports that markup, if available. This * overrides all other attributes, i.e, it is treated as an automatic "top priority" * attribute. diff --git a/kttsd/kttsd/threadedplugin.cpp b/kttsd/kttsd/threadedplugin.cpp index eacd598..6158588 100644 --- a/kttsd/kttsd/threadedplugin.cpp +++ b/kttsd/kttsd/threadedplugin.cpp @@ -33,11 +33,11 @@ * Constructor. */ ThreadedPlugIn::ThreadedPlugIn(PlugInProc* plugin, - TQObject *parent /*= 0*/, const char *name /*= 0*/): - PlugInProc(parent, name), + TQObject *tqparent /*= 0*/, const char *name /*= 0*/): + PlugInProc(tqparent, name), TQThread(), m_plugin(plugin), - m_filename(TQString::null), + m_filename(TQString()), m_requestExit(false), m_supportsSynth(false) { @@ -188,7 +188,7 @@ void ThreadedPlugIn::ackFinished() { // Since plugin should not be running, don't bother with Mutex here. if (m_state == psFinished) m_state = psIdle; - m_filename = TQString::null; + m_filename = TQString(); } /** @@ -265,7 +265,7 @@ void ThreadedPlugIn::run() m_state = psSynthing; m_stateMutex.unlock(); TQString filename = m_filename; - m_filename = TQString::null; + m_filename = TQString(); kdDebug() << "ThreadedPlugIn::run calling synthText" << endl; m_plugin->synthText(m_text, filename); kdDebug() << "ThreadedPlugIn::run back from synthText" << endl; diff --git a/kttsd/kttsd/threadedplugin.h b/kttsd/kttsd/threadedplugin.h index 1a1b13e..c2ee0d6 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 *parent = 0, const char *name = 0); + ThreadedPlugIn(PlugInProc* plugin, TQObject *tqparent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp index 4d80bb4..097d594 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.cpp +++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp @@ -65,10 +65,10 @@ KttsJobMgrFactory::~KttsJobMgrFactory() s_instance = 0; } -TQObject *KttsJobMgrFactory::createObject(TQObject *parent, const char *name, const char*, +TQObject *KttsJobMgrFactory::createObject(TQObject *tqparent, const char *name, const char*, const TQStringList& ) { - TQObject *obj = new KttsJobMgrPart((TQWidget*)parent, name); + TQObject *obj = new KttsJobMgrPart((TQWidget*)tqparent, name); emit objectCreated(obj); return obj; } @@ -86,10 +86,10 @@ KAboutData *KttsJobMgrFactory::aboutData() return about; } -KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : +KttsJobMgrPart::KttsJobMgrPart(TQWidget *tqparent, const char *name) : DCOPStub("kttsd", "KSpeech"), DCOPObject("kttsjobmgr_kspeechsink"), - KParts::ReadOnlyPart(parent, name) + KParts::ReadOnlyPart(TQT_TQOBJECT(tqparent), name) { // Initialize some variables. m_selectOnTextSet = false; @@ -101,12 +101,12 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : KGlobal::locale()->insertCatalogue("kttsd"); // Create a TQVBox to host everything. - TQVBox* vBox = new TQVBox(parent); + TQVBox* vBox = new TQVBox(tqparent); vBox->setMargin(6); // Create a splitter to contain the Job List View and the current sentence. TQSplitter* splitter = new TQSplitter(vBox); - splitter->setOrientation(TQSplitter::Vertical); + splitter->setOrientation(Qt::Vertical); // Create Job List View widget. m_jobListView = new KListView(splitter, "joblistview"); @@ -163,7 +163,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : hbox3->setSpacing(6); // Do not let button box stretch vertically. - m_buttonBox->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); + m_buttonBox->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed)); // All the buttons with "job_" at start of their names will be enabled/disabled when a job is // selected in the Job List View. @@ -274,7 +274,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) : // Create a label for current sentence. TQLabel* currentSentenceLabel = new TQLabel(sentenceVBox); - currentSentenceLabel->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); + currentSentenceLabel->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); currentSentenceLabel->setText(i18n("Current Sentence")); // Create a box to contain the current sentence. @@ -490,7 +490,7 @@ void KttsJobMgrPart::slot_job_change_talker() { TQString talkerID = item->text(jlvcTalkerID); TQStringList talkerIDs = m_talkerCodesToTalkerIDs.values(); - int ndx = talkerIDs.findIndex(talkerID); + int ndx = talkerIDs.tqfindIndex(talkerID); TQString talkerCode; if (ndx >= 0) talkerCode = m_talkerCodesToTalkerIDs.keys()[ndx]; SelectTalkerDlg dlg(widget(), "selecttalkerdialog", i18n("Select Talker"), talkerCode, true); @@ -506,7 +506,7 @@ void KttsJobMgrPart::slot_job_change_talker() void KttsJobMgrPart::slot_speak_clipboard() { // Get the clipboard object. - QClipboard *cb = kapp->clipboard(); + TQClipboard *cb = kapp->tqclipboard(); // Copy text from the clipboard. @@ -518,7 +518,7 @@ void KttsJobMgrPart::slot_speak_clipboard() { if (supportsMarkup(NULL, KSpeech::mtHtml)) { - TQByteArray d = data->encodedData("text/html"); + TQByteArray d = data->tqencodedData("text/html"); text = TQString(d); } } @@ -526,7 +526,7 @@ void KttsJobMgrPart::slot_speak_clipboard() { if (supportsMarkup(NULL, KSpeech::mtSsml)) { - TQByteArray d = data->encodedData("text/ssml"); + TQByteArray d = data->tqencodedData("text/ssml"); text = TQString(d); } } @@ -632,7 +632,7 @@ int KttsJobMgrPart::getCurrentJobPartCount() */ TQListViewItem* KttsJobMgrPart::findItemByJobNum(const uint jobNum) { - return m_jobListView->findItem(TQString::number(jobNum), jlvcJobNum); + return m_jobListView->tqfindItem(TQString::number(jobNum), jlvcJobNum); } /** @@ -746,7 +746,7 @@ void KttsJobMgrPart::autoSelectInJobListView() TQString KttsJobMgrPart::cachedTalkerCodeToTalkerID(const TQString& talkerCode) { // If in the cache, return that. - if (m_talkerCodesToTalkerIDs.contains(talkerCode)) + if (m_talkerCodesToTalkerIDs.tqcontains(talkerCode)) return m_talkerCodesToTalkerIDs[talkerCode]; else { @@ -952,7 +952,7 @@ ASYNC KttsJobMgrPart::textFinished(const TQCString&, const uint jobNum) // Update sentence pointer, since signal may not be emitted for final CR. refreshJob(jobNum); } - m_currentSentence->setText(TQString::null); + m_currentSentence->setText(TQString()); } /** @@ -1013,8 +1013,8 @@ ASYNC KttsJobMgrPart::textRemoved(const TQCString&, const uint jobNum) autoSelectInJobListView(); } -KttsJobMgrBrowserExtension::KttsJobMgrBrowserExtension(KttsJobMgrPart *parent) - : KParts::BrowserExtension(parent, "KttsJobMgrBrowserExtension") +KttsJobMgrBrowserExtension::KttsJobMgrBrowserExtension(KttsJobMgrPart *tqparent) + : KParts::BrowserExtension(tqparent, "KttsJobMgrBrowserExtension") { } diff --git a/kttsd/kttsjobmgr/kttsjobmgr.h b/kttsd/kttsjobmgr/kttsjobmgr.h index 6274723..216531d 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.h +++ b/kttsd/kttsjobmgr/kttsjobmgr.h @@ -37,12 +37,13 @@ class KTextEdit; class KttsJobMgrFactory : public KLibFactory { Q_OBJECT + TQ_OBJECT public: KttsJobMgrFactory() {}; virtual ~KttsJobMgrFactory(); - virtual TQObject* createObject(TQObject* parent = 0, const char* name = 0, - const char* classname = "TQObject", + virtual TQObject* createObject(TQObject* tqparent = 0, const char* name = 0, + const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); static KInstance *instance(); @@ -58,8 +59,9 @@ class KttsJobMgrPart: virtual public KSpeechSink { Q_OBJECT + TQ_OBJECT public: - KttsJobMgrPart(TQWidget *parent, const char *name); + KttsJobMgrPart(TQWidget *tqparent, const char *name); virtual ~KttsJobMgrPart(); protected: @@ -288,9 +290,10 @@ private: class KttsJobMgrBrowserExtension : public KParts::BrowserExtension { Q_OBJECT + TQ_OBJECT friend class KttsJobMgrPart; public: - KttsJobMgrBrowserExtension(KttsJobMgrPart *parent); + KttsJobMgrBrowserExtension(KttsJobMgrPart *tqparent); virtual ~KttsJobMgrBrowserExtension(); }; diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index 68bd74d..9cfe77a 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqimage.h> // KDE includes. @@ -135,7 +135,7 @@ int main (int argc, char *argv[]) /* KttsToolTip class */ -KttsToolTip::KttsToolTip ( TQWidget* parent ) : TQToolTip(parent) +KttsToolTip::KttsToolTip ( TQWidget* tqparent ) : TQToolTip(tqparent) { } @@ -143,19 +143,19 @@ KttsToolTip::KttsToolTip ( TQWidget* parent ) : TQToolTip(parent) { Q_UNUSED(p); - if (!parentWidget()->inherits("KttsMgrTray")) + if (!tqparentWidget()->inherits("KttsMgrTray")) return; - KttsMgrTray* kttsMgrTray = dynamic_cast<KttsMgrTray*>(parentWidget()); + KttsMgrTray* kttsMgrTray = dynamic_cast<KttsMgrTray*>(tqparentWidget()); - TQRect r(kttsMgrTray->geometry()); + TQRect r(kttsMgrTray->tqgeometry()); if ( !r.isValid() ) return; TQString status = "<qt><b>KTTSMgr</b> - "; status += i18n("<qt>Text-to-Speech Manager"); status += "<br/><br/>"; - status += kttsMgrTray->getStatus(); + status += kttsMgrTray->gettqStatus(); status += "</qt>"; tip(r, status); @@ -163,10 +163,10 @@ KttsToolTip::KttsToolTip ( TQWidget* parent ) : TQToolTip(parent) /* KttsMgrTray class */ -KttsMgrTray::KttsMgrTray(TQWidget *parent): +KttsMgrTray::KttsMgrTray(TQWidget *tqparent): DCOPStub("kttsd", "KSpeech"), DCOPObject("kkttsmgr_kspeechsink"), - KSystemTray(parent, "kttsmgrsystemtray") + KSystemTray(tqparent, "kttsmgrsystemtray") { TQPixmap icon = KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small); setPixmap (icon); @@ -200,7 +200,7 @@ KttsMgrTray::KttsMgrTray(TQWidget *parent): "textFinished(TQCString,uint)", false); // Install an event filter so we can check when KTTSMgr becomes inconified to the systray. - parent->installEventFilter(this); + tqparent->installEventFilter(this); } } @@ -224,7 +224,7 @@ void KttsMgrTray::textFinished(const TQCString& /*appId*/, uint /*jobNum*/) void KttsMgrTray::exitWhenFinishedSpeaking() { // kdDebug() << "KttsMgrTray::exitWhenFinishedSpeaking: running" << endl; - if ( parentWidget()->isShown() ) return; + if ( tqparentWidget()->isShown() ) return; TQString jobNums = getTextJobNumbers(); TQStringList jobNumsList = TQStringList::split(jobNums, ","); uint jobNumsListCount = jobNumsList.count(); @@ -257,7 +257,7 @@ TQString KttsMgrTray::stateToStr(int state) } } -TQString KttsMgrTray::getStatus() +TQString KttsMgrTray::gettqStatus() { if (!isKttsdRunning()) return i18n("Text-to-Speech System is not running"); uint jobCount = getTextJobCount(); @@ -268,12 +268,12 @@ TQString KttsMgrTray::getStatus() int jobState = 0; if (job != 0) { - // kdDebug() << "KttsMgrTray::getStatus: job = " << job << endl; + // kdDebug() << "KttsMgrTray::gettqStatus: job = " << job << endl; jobState = getTextJobState(job); int sentenceCount = getTextCount(job); uint seq = moveRelTextSentence(0, job); status += i18n(", current job %1 at sentence %2 of %3 sentences" - ).arg(stateToStr(jobState)).arg(seq).arg(sentenceCount); + ).tqarg(stateToStr(jobState)).tqarg(seq).tqarg(sentenceCount); } } return status; @@ -298,7 +298,7 @@ void KttsMgrTray::aboutSelected() void KttsMgrTray::helpSelected() { - kapp->invokeHelp(TQString::null,"kttsd"); + kapp->invokeHelp(TQString(),"kttsd"); } void KttsMgrTray::quitSelected() diff --git a/kttsd/kttsmgr/kttsmgr.h b/kttsd/kttsmgr/kttsmgr.h index 21f54a7..af7765c 100644 --- a/kttsd/kttsmgr/kttsmgr.h +++ b/kttsd/kttsmgr/kttsmgr.h @@ -25,7 +25,7 @@ #ifndef KTTSMGR_H #define KTTSMGR_H -// Qt includes. +// TQt includes. #include <tqevent.h> #include <tqtooltip.h> @@ -36,10 +36,10 @@ #include "kspeech_stub.h" #include "kspeechsink.h" -class KttsToolTip: public QToolTip +class KttsToolTip: public TQToolTip { public: - KttsToolTip ( TQWidget* parent ); + KttsToolTip ( TQWidget* tqparent ); protected: virtual void maybeTip ( const TQPoint & p ); @@ -48,13 +48,14 @@ class KttsToolTip: public QToolTip class KttsMgrTray: public KSystemTray, public KSpeech_stub, virtual public KSpeechSink { Q_OBJECT + TQ_OBJECT public: - KttsMgrTray(TQWidget *parent=0); + KttsMgrTray(TQWidget *tqparent=0); ~KttsMgrTray(); void setExitWhenFinishedSpeaking(); - TQString getStatus(); + TQString gettqStatus(); protected: // ASYNC textStarted(const TQCString& appId, uint jobNum); diff --git a/kttsd/libkttsd/filterconf.cpp b/kttsd/libkttsd/filterconf.cpp index 4947698..bfeb1f5 100644 --- a/kttsd/libkttsd/filterconf.cpp +++ b/kttsd/libkttsd/filterconf.cpp @@ -26,7 +26,7 @@ #include <stdlib.h> #include <sys/param.h> -// Qt includes. +// TQt includes. #include <tqfile.h> #include <tqfileinfo.h> #include <tqstring.h> @@ -42,7 +42,7 @@ /** * Constructor */ -KttsFilterConf::KttsFilterConf( TQWidget *parent, const char *name) : TQWidget(parent, name){ +KttsFilterConf::KttsFilterConf( TQWidget *tqparent, const char *name) : TQWidget(tqparent, name){ // kdDebug() << "KttsFilterConf::KttsFilterConf: Running" << endl; TQString systemPath(getenv("PATH")); // kdDebug() << "Path is " << systemPath << endl; @@ -114,7 +114,7 @@ bool KttsFilterConf::supportsMultiInstance() { return false; } * return an empty string. * @return Filter instance name. */ -TQString KttsFilterConf::userPlugInName() { return TQString::null; } +TQString KttsFilterConf::userPlugInName() { return TQString(); } /** * Returns True if this filter is a Sentence Boundary Detector. @@ -125,7 +125,7 @@ bool KttsFilterConf::isSBD() { return false; } /** * Return the full path to any program in the $PATH environmental variable * @param name The name of the file to search for. -* @returns The path to the file on success, a blank QString +* @returns The path to the file on success, a blank TQString * if its not found. */ TQString KttsFilterConf::getLocation(const TQString &name) { diff --git a/kttsd/libkttsd/filterconf.h b/kttsd/libkttsd/filterconf.h index 7fdc8e4..c508532 100644 --- a/kttsd/libkttsd/filterconf.h +++ b/kttsd/libkttsd/filterconf.h @@ -25,7 +25,7 @@ #ifndef _FILTERCONF_H_ #define _FILTERCONF_H_ -// Qt includes. +// TQt includes. #include <tqwidget.h> // KDE includes. @@ -34,14 +34,15 @@ #include <kdemacros.h> #include "kdeexportfix.h" -class KDE_EXPORT KttsFilterConf : public QWidget{ +class KDE_EXPORT KttsFilterConf : public TQWidget{ Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - KttsFilterConf( TQWidget *parent = 0, const char *name = 0); + KttsFilterConf( TQWidget *tqparent = 0, const char *name = 0); /** * Destructor @@ -137,7 +138,7 @@ class KDE_EXPORT KttsFilterConf : public QWidget{ * Searches the $PATH variable for any file. If that file exists in the PATH, or * is contained in any directory in the PATH, it returns the full path to it. * @param name The name of the file to search for. - * @returns The path to the file on success, a blank QString + * @returns The path to the file on success, a blank TQString * if its not found. */ TQString getLocation(const TQString &name); diff --git a/kttsd/libkttsd/filterproc.cpp b/kttsd/libkttsd/filterproc.cpp index 8de5c62..9daf281 100644 --- a/kttsd/libkttsd/filterproc.cpp +++ b/kttsd/libkttsd/filterproc.cpp @@ -31,8 +31,8 @@ /** * Constructor. */ -KttsFilterProc::KttsFilterProc( TQObject *parent, const char *name) : - TQObject(parent, name) +KttsFilterProc::KttsFilterProc( TQObject *tqparent, const char *name) : + TQObject(tqparent, name) { // kdDebug() << "KttsFilterProc::KttsFilterProc: Running" << endl; } @@ -123,7 +123,7 @@ bool KttsFilterProc::init(KConfig* /*config*/, const TQString& /*configGroup*/){ /** * Returns the filtered output. */ -/*virtual*/ TQString KttsFilterProc::getOutput() { return TQString::null; } +/*virtual*/ TQString KttsFilterProc::getOutput() { return TQString(); } /** * Acknowledges the finished filtering. diff --git a/kttsd/libkttsd/filterproc.h b/kttsd/libkttsd/filterproc.h index bc11921..3484061 100644 --- a/kttsd/libkttsd/filterproc.h +++ b/kttsd/libkttsd/filterproc.h @@ -25,7 +25,7 @@ #ifndef _FILTERPROC_H_ #define _FILTERPROC_H_ -// Qt includes. +// TQt includes. #include <tqobject.h> #include <tqstringlist.h> @@ -36,9 +36,10 @@ class TalkerCode; class KConfig; -class KDE_EXPORT KttsFilterProc : virtual public QObject +class KDE_EXPORT KttsFilterProc : virtual public TQObject { Q_OBJECT + TQ_OBJECT public: enum FilterState { @@ -51,7 +52,7 @@ public: /** * Constructor. */ - KttsFilterProc( TQObject *parent, const char *name ); + KttsFilterProc( TQObject *tqparent, const char *name ); /** * Destructor. diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp index c633779..f21f813 100644 --- a/kttsd/libkttsd/notify.cpp +++ b/kttsd/libkttsd/notify.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqstringlist.h> @@ -68,7 +68,7 @@ static void notifyaction_init() /*static*/ int NotifyAction::action( const TQString& actionName ) { notifyaction_init(); - return s_actionNames->findIndex( actionName ); + return s_actionNames->tqfindIndex( actionName ); } /*static*/ TQString NotifyAction::actionDisplayName( const int action ) @@ -126,7 +126,7 @@ static void notifypresent_init() /*static*/ int NotifyPresent::present( const TQString& presentName ) { notifypresent_init(); - return s_presentNames->findIndex( presentName ); + return s_presentNames->tqfindIndex( presentName ); } /*static*/ TQString NotifyPresent::presentDisplayName( const int present ) @@ -148,9 +148,9 @@ static void notifypresent_init() */ /*static*/ TQString NotifyEvent::getEventSrcName(const TQString& eventSrc, TQString& iconName) { - TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" ); + TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" ); KConfig* config = new KConfig( configFilename, true, false, "data" ); - config->setGroup( TQString::fromLatin1( "!Global!" ) ); + config->setGroup( TQString::tqfromLatin1( "!Global!" ) ); TQString appDesc = config->readEntry( "Comment", i18n("No description available") ); iconName = config->readEntry( "IconName" ); delete config; @@ -163,13 +163,13 @@ static void notifypresent_init() /*static*/ TQString NotifyEvent::getEventName(const TQString& eventSrc, const TQString& event) { TQString eventName; - TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" ); + TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" ); KConfig* config = new KConfig( configFilename, true, false, "data" ); if ( config->hasGroup( event ) ) { config->setGroup( event ); - eventName = config->readEntry( TQString::fromLatin1( "Comment" ), - config->readEntry( TQString::fromLatin1( "Name" ))); + eventName = config->readEntry( TQString::tqfromLatin1( "Comment" ), + config->readEntry( TQString::tqfromLatin1( "Name" ))); } delete config; return eventName; diff --git a/kttsd/libkttsd/player.h b/kttsd/libkttsd/player.h index f83c5b4..a0b8311 100644 --- a/kttsd/libkttsd/player.h +++ b/kttsd/libkttsd/player.h @@ -25,9 +25,10 @@ // #include "filehandle.h" -class KDE_EXPORT Player : virtual public QObject +class KDE_EXPORT Player : virtual public TQObject { Q_OBJECT + TQ_OBJECT public: virtual ~Player() {} @@ -66,8 +67,8 @@ public: virtual void setPeriods(uint periods) {Q_UNUSED(periods); } protected: - Player(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList() ) : - TQObject(parent, name) { + Player(TQObject* tqparent = 0, const char* name = 0, const TQStringList& args=TQStringList() ) : + TQObject(tqparent, name) { Q_UNUSED(args); } diff --git a/kttsd/libkttsd/pluginconf.cpp b/kttsd/libkttsd/pluginconf.cpp index f23eaed..8138547 100644 --- a/kttsd/libkttsd/pluginconf.cpp +++ b/kttsd/libkttsd/pluginconf.cpp @@ -19,7 +19,7 @@ #include <stdlib.h> #include <sys/param.h> -// Qt includes. +// TQt includes. #include <tqfile.h> #include <tqfileinfo.h> #include <tqstring.h> @@ -36,7 +36,7 @@ /** * Constructor */ -PlugInConf::PlugInConf( TQWidget *parent, const char *name) : TQWidget(parent, name){ +PlugInConf::PlugInConf( TQWidget *tqparent, const char *name) : TQWidget(tqparent, name){ kdDebug() << "PlugInConf::PlugInConf: Running" << endl; KGlobal::locale()->insertCatalogue("kttsd"); TQString systemPath(getenv("PATH")); @@ -110,7 +110,7 @@ bool PlugInConf::supportsMultiInstance() { return true; } * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. -* If the passed-in code is TQString::null, no specific language has +* If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -122,10 +122,10 @@ void PlugInConf::setDesiredLanguage(const TQString& /*lang*/ ) { } * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, -* i.e., cannot yet synthesize, return TQString::null. +* i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ -TQString PlugInConf::getTalkerCode() { return TQString::null; } +TQString PlugInConf::getTalkerCode() { return TQString(); } /** * Return a list of all the languages currently supported by the plugin. @@ -143,7 +143,7 @@ TQStringList PlugInConf::getSupportedLanguages() { return TQStringList(); } /** * Return the full path to any program in the $PATH environmental variable * @param name The name of the file to search for. -* @returns The path to the file on success, a blank QString +* @returns The path to the file on success, a blank TQString * if its not found. */ TQString PlugInConf::getLocation(const TQString &name) { diff --git a/kttsd/libkttsd/pluginconf.h b/kttsd/libkttsd/pluginconf.h index 90d3cec..b76ec21 100644 --- a/kttsd/libkttsd/pluginconf.h +++ b/kttsd/libkttsd/pluginconf.h @@ -18,7 +18,7 @@ #ifndef _PLUGINCONF_H_ #define _PLUGINCONF_H_ -// Qt includes. +// TQt includes. #include <tqwidget.h> // KDE includes. @@ -125,7 +125,7 @@ * Next, @ref getTalkerCode * will be called. If your plugin can automatically configure itself to the desired * language, it should do so and return a fully-specified talker code. If your -* plugin is not yet ready and requires user help, return TQString::null. Note that +* plugin is not yet ready and requires user help, return TQString(). Note that * @ref setDesiredLanguage may be Null, in which case, you should allow the * user to configure your plugin to any of your supported languages. * @@ -138,7 +138,7 @@ * - @e lang. If user has completed configuring your plugin, i.e., it is * ready to begin synthesizing, return the ISO 639-1 language code * for the language it can synthesize. If your plugin is not yet -* fully configured, you should return TQString::null for the entire +* fully configured, you should return TQString() for the entire * talker code. If your plugin supports a specific national version * of a language, that should also be included using the ISO 3166 * country code separated from the language code by underscore (_). @@ -207,14 +207,15 @@ * order to synthesize speech. */ -class KDE_EXPORT PlugInConf : public QWidget{ +class KDE_EXPORT PlugInConf : public TQWidget{ Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - PlugInConf( TQWidget *parent = 0, const char *name = 0); + PlugInConf( TQWidget *tqparent = 0, const char *name = 0); /** * Destructor @@ -281,7 +282,7 @@ class KDE_EXPORT PlugInConf : public QWidget{ * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -299,7 +300,7 @@ class KDE_EXPORT PlugInConf : public QWidget{ * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ virtual TQString getTalkerCode(); @@ -356,7 +357,7 @@ class KDE_EXPORT PlugInConf : public QWidget{ * Searches the $PATH variable for any file. If that file exists in the PATH, or * is contained in any directory in the PATH, it returns the full path to it. * @param name The name of the file to search for. - * @returns The path to the file on success, a blank QString + * @returns The path to the file on success, a blank TQString * if its not found. */ TQString getLocation(const TQString &name); diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp index a712687..39c523b 100644 --- a/kttsd/libkttsd/pluginproc.cpp +++ b/kttsd/libkttsd/pluginproc.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqtextcodec.h> @@ -31,7 +31,7 @@ /** * Constructor */ -PlugInProc::PlugInProc( TQObject *parent, const char *name) : TQObject(parent, name){ +PlugInProc::PlugInProc( TQObject *tqparent, const char *name) : TQObject(tqparent, name){ // kdDebug() << "PlugInProc::PlugInProc: Running" << endl; } @@ -79,7 +79,7 @@ void PlugInProc::synthText(const TQString& /*text*/, const TQString& /*suggested * * The plugin must not re-use the filename. */ -TQString PlugInProc::getFilename() { return TQString::null; } +TQString PlugInProc::getFilename() { return TQString(); } /** * Stop current operation (saying or synthesizing text). diff --git a/kttsd/libkttsd/pluginproc.h b/kttsd/libkttsd/pluginproc.h index 8d867bc..ab156b3 100644 --- a/kttsd/libkttsd/pluginproc.h +++ b/kttsd/libkttsd/pluginproc.h @@ -114,8 +114,8 @@ * when @ref sayText or @ref synthText is called, * with the exception of KProcess and family (KProcIO, KShellProcess). * This restriction comes about because the KDE Libraries make use of the -* main Qt event loop, which unfortunately, runs only in the main thread. -* This restriction will likely be lifted in Qt 4 and later. +* main TQt event loop, which unfortunately, runs only in the main thread. +* This restriction will likely be lifted in TQt 4 and later. * * Since the KDE library is not available from the @ref sayText and @ref synthText methods, * it is best if the plugin reads configuration settings in the @ref init method. @@ -135,7 +135,7 @@ * running. Keep this in mind when implementing the code. * * If the plugin returns True from @ref supportsAsync, you will of course -* need to deal with similar issues. If you have to use QThreads +* need to deal with similar issues. If you have to use TQThreads * to implement asynchronous support, do not be concerned about emitting * the @ref sayFinished or @ref synthFinished signals from your threads, since * KTTSD will convert the received signals into postEvents and @@ -227,8 +227,9 @@ enum pluginState psFinished = 3 /**< Plugin has finished synthesizing. Audio file is ready. */ }; -class KDE_EXPORT PlugInProc : virtual public QObject{ +class KDE_EXPORT PlugInProc : virtual public TQObject{ Q_OBJECT + TQ_OBJECT public: enum CharacterCodec { @@ -241,7 +242,7 @@ class KDE_EXPORT PlugInProc : virtual public QObject{ /** * Constructor. */ - PlugInProc( TQObject *parent = 0, const char *name = 0); + PlugInProc( TQObject *tqparent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/libkttsd/selecttalkerdlg.cpp b/kttsd/libkttsd/selecttalkerdlg.cpp index 9028bf7..99a2b03 100644 --- a/kttsd/libkttsd/selecttalkerdlg.cpp +++ b/kttsd/libkttsd/selecttalkerdlg.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqcheckbox.h> #include <tqradiobutton.h> #include <tqhbox.h> @@ -45,14 +45,14 @@ #include "selecttalkerdlg.moc" SelectTalkerDlg::SelectTalkerDlg( - TQWidget* parent, + TQWidget* tqparent, const char* name, const TQString& caption, const TQString& talkerCode, bool runningTalkers) : KDialogBase( - parent, + tqparent, name, true, caption, @@ -69,25 +69,25 @@ SelectTalkerDlg::SelectTalkerDlg( // Fill combo boxes. KComboBox* cb = m_widget->genderComboBox; - cb->insertItem( TQString::null ); + cb->insertItem( TQString() ); cb->insertItem( TalkerCode::translatedGender("male") ); cb->insertItem( TalkerCode::translatedGender("female") ); cb->insertItem( TalkerCode::translatedGender("neutral") ); cb = m_widget->volumeComboBox; - cb->insertItem( TQString::null ); + cb->insertItem( TQString() ); cb->insertItem( TalkerCode::translatedVolume("medium") ); cb->insertItem( TalkerCode::translatedVolume("loud") ); cb->insertItem( TalkerCode::translatedVolume("soft") ); cb = m_widget->rateComboBox; - cb->insertItem( TQString::null ); + cb->insertItem( TQString() ); cb->insertItem( TalkerCode::translatedRate("medium") ); cb->insertItem( TalkerCode::translatedRate("fast") ); cb->insertItem( TalkerCode::translatedRate("slow") ); cb = m_widget->synthComboBox; - cb->insertItem( TQString::null ); + cb->insertItem( TQString() ); KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin"); for(unsigned int i=0; i < offers.count() ; ++i) cb->insertItem(offers[i]->name()); @@ -170,7 +170,7 @@ void SelectTalkerDlg::slotLanguageBrowseButton_clicked() TQString locale; TQString language; // Blank line so user can select no language. - // Note: Don't use TQString::null, which gets displayed at bottom of list, rather than top. + // Note: Don't use TQString(), which gets displayed at bottom of list, rather than top. TQListViewItem* item = new KListViewItem(langLView, "", ""); if (m_talkerCode.languageCode().isEmpty()) item->setSelected(true); int allLocalesCount = allLocales.count(); @@ -200,7 +200,7 @@ void SelectTalkerDlg::slotLanguageBrowseButton_clicked() // TODO: This isn't working. Furthermore, item appears selected but is not. langLView->ensureItemVisible(langLView->selectedItem()); int dlgResult = dlg->exec(); - language = TQString::null; + language = TQString(); if (dlgResult == TQDialog::Accepted) { if (langLView->selectedItem()) @@ -274,7 +274,7 @@ void SelectTalkerDlg::applyTalkerCodeToControls() void SelectTalkerDlg::applyControlsToTalkerCode() { if ( m_widget->useDefaultRadioButton->isChecked() ) - m_talkerCode = TalkerCode(TQString::null, false); + m_talkerCode = TalkerCode(TQString(), false); else if ( m_widget->useClosestMatchRadioButton->isChecked() ) { // Language already stored in talker code. @@ -327,11 +327,11 @@ void SelectTalkerDlg::loadTalkers(bool /*runningTalkers*/) { TQString talkerID = *it; config->setGroup("Talker_" + talkerID); - TQString talkerCode = config->readEntry("TalkerCode", TQString::null); + TQString talkerCode = config->readEntry("TalkerCode", TQString()); // Parse and normalize the talker code. TalkerCode talker = TalkerCode(talkerCode, true); m_talkers.append(talker); - TQString desktopEntryName = config->readEntry("DesktopEntryName", TQString::null); + TQString desktopEntryName = config->readEntry("DesktopEntryName", TQString()); TQString synthName = TalkerCode::TalkerDesktopEntryNameToName(desktopEntryName); // Display in List View using translated strings. item = new KListViewItem(lv, item); diff --git a/kttsd/libkttsd/selecttalkerdlg.h b/kttsd/libkttsd/selecttalkerdlg.h index 799f588..2ac7c30 100644 --- a/kttsd/libkttsd/selecttalkerdlg.h +++ b/kttsd/libkttsd/selecttalkerdlg.h @@ -27,7 +27,7 @@ #ifndef _SELECTTALKERDLG_H_ #define _SELECTTALKERDLG_H_ -// Qt includes. +// TQt includes. #include <tqvaluelist.h> // KDE includes. @@ -42,11 +42,12 @@ class KDE_EXPORT SelectTalkerDlg : public KDialogBase { Q_OBJECT + TQ_OBJECT public: /** * Constructor. - * @param parent The parent for this dialog. + * @param tqparent The tqparent for this dialog. * @param name Name for this dialog. * @param caption Displayed title for this dialog. * @param talkerCode A suggested starting Talker Code. @@ -55,10 +56,10 @@ class KDE_EXPORT SelectTalkerDlg : public KDialogBase * (which may not yet have been Applied). */ SelectTalkerDlg( - TQWidget* parent = 0, + TQWidget* tqparent = 0, const char* name = "selecttalkerdialog", const TQString& caption = i18n("Select Talker"), - const TQString& talkerCode = TQString::null, + const TQString& talkerCode = TQString(), bool runningTalkers = false); /** @@ -67,7 +68,7 @@ class KDE_EXPORT SelectTalkerDlg : public KDialogBase ~SelectTalkerDlg(); /** - * Returns the Talker Code user chose. TQString::null if default Talker chosen. + * Returns the Talker Code user chose. TQString() if default Talker chosen. * Note that if user did not choose a specific Talker, this will be a partial Talker Code. */ TQString getSelectedTalkerCode(); diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui index adcc8a9..7e9ad64 100644 --- a/kttsd/libkttsd/selecttalkerwidget.ui +++ b/kttsd/libkttsd/selecttalkerwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SelectTalkerWidget</class> <author>Gary Cramblitt <garycramblitt@comcast.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>SelectTalkerWidget</cstring> </property> @@ -28,7 +28,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -53,7 +53,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>useDefaultRadioButton</cstring> </property> @@ -64,7 +64,7 @@ <string>When checked, will use the default Talker, which is the topmost Talker listed in the Talkers tab.</string> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>useClosestMatchRadioButton</cstring> </property> @@ -75,9 +75,9 @@ <string>When checked, will use a configured Talker most closely matching the attributes you choose. Attributes with checks next to them will be preferred over unchecked attributes. Language is always preferred.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> @@ -93,14 +93,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> </size> </property> </spacer> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>closestMatchGroupBox</cstring> </property> @@ -117,7 +117,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QLabel" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQLabel" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>preferredLabel</cstring> </property> @@ -125,22 +125,22 @@ <string>Checked items are preferred over unchecked items.</string> </property> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout11_2</cstring> + <cstring>tqlayout11_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>synthLabel</cstring> </property> <property name="text"> <string>&Synthesizer:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> @@ -152,7 +152,7 @@ <cstring>synthComboBox</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>synthCheckBox</cstring> </property> @@ -176,15 +176,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="2"> + <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>genderLabel</cstring> </property> @@ -200,7 +200,7 @@ <cstring>genderComboBox</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>genderCheckBox</cstring> </property> @@ -241,15 +241,15 @@ <enum>Vertical</enum> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>volumeLabel</cstring> </property> @@ -265,7 +265,7 @@ <cstring>volumeComboBox</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>volumeCheckBox</cstring> </property> @@ -289,15 +289,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="2"> + <widget class="TQLayoutWidget" row="1" column="2"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>rateLabel</cstring> </property> @@ -313,7 +313,7 @@ <cstring>rateComboBox</cstring> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>rateCheckBox</cstring> </property> @@ -337,15 +337,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>languageLabel</cstring> </property> @@ -385,7 +385,7 @@ <string>Click to select one or more languages. This filter will be applied to text jobs of those languages.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>languageCheckBox</cstring> </property> @@ -413,7 +413,7 @@ </widget> </hbox> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>useSpecificTalkerRadioButton</cstring> </property> @@ -424,9 +424,9 @@ <string>When checked, will use the specific Talker (if it is still configured), otherwise the Talker most closely matching.</string> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -442,7 +442,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>20</height> @@ -559,7 +559,7 @@ <tabstop>useSpecificTalkerRadioButton</tabstop> <tabstop>talkersListView</tabstop> </tabstops> -<layoutdefaults spacing="6" margin="0"/> +<tqlayoutdefaults spacing="6" margin="0"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kcombobox.h</includehint> diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp index 91ae8fe..14f0b83 100644 --- a/kttsd/libkttsd/stretcher.cpp +++ b/kttsd/libkttsd/stretcher.cpp @@ -34,8 +34,8 @@ /** * Constructor. */ -Stretcher::Stretcher(TQObject *parent, const char *name) : - TQObject(parent, name) +Stretcher::Stretcher(TQObject *tqparent, const char *name) : + TQObject(tqparent, name) { m_state = 0; m_stretchProc = 0; @@ -61,7 +61,7 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename, if (m_stretchProc) return false; m_outFilename = outFilename; m_stretchProc = new KProcess; - TQString stretchStr = TQString("%1").arg(stretchFactor, 0, 'f', 3); + TQString stretchStr = TQString("%1").tqarg(stretchFactor, 0, 'f', 3); *m_stretchProc << "sox" << inFilename << outFilename << "stretch" << stretchStr; connect(m_stretchProc, TQT_SIGNAL(processExited(KProcess*)), this, TQT_SLOT(slotProcessExited(KProcess*))); diff --git a/kttsd/libkttsd/stretcher.h b/kttsd/libkttsd/stretcher.h index 676b690..e0c7e72 100644 --- a/kttsd/libkttsd/stretcher.h +++ b/kttsd/libkttsd/stretcher.h @@ -31,14 +31,15 @@ class KProcess; -class KDE_EXPORT Stretcher : public QObject{ +class KDE_EXPORT Stretcher : public TQObject{ Q_OBJECT + TQ_OBJECT public: /** * Constructor. */ - Stretcher(TQObject *parent = 0, const char *name = 0); + Stretcher(TQObject *tqparent = 0, const char *name = 0); /** * Destructor. diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp index 08c89a1..2b3fbcf 100644 --- a/kttsd/libkttsd/talkercode.cpp +++ b/kttsd/libkttsd/talkercode.cpp @@ -34,7 +34,7 @@ /** * Constructor. */ -TalkerCode::TalkerCode(const TQString &code/*=TQString::null*/, bool normal /*=false*/) +TalkerCode::TalkerCode(const TQString &code/*=TQString()*/, bool normal /*=false*/) { if (!code.isEmpty()) parseTalkerCode(code); @@ -304,7 +304,7 @@ void TalkerCode::normalize() void TalkerCode::parseTalkerCode(const TQString &talkerCode) { TQString fullLanguageCode; - if (talkerCode.contains("\"")) + if (talkerCode.tqcontains("\"")) { fullLanguageCode = talkerCode.section("lang=", 1, 1); fullLanguageCode = fullLanguageCode.section('"', 1, 1); @@ -487,15 +487,15 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode) * Uses KTrader to convert a translated Synth Plugin Name to DesktopEntryName. * @param name The translated plugin name. From Name= line in .desktop file. * @return DesktopEntryName. The name of the .desktop file (less .desktop). -* TQString::null if not found. +* TQString() if not found. */ /*static*/ TQString TalkerCode::TalkerNameToDesktopEntryName(const TQString& name) { - if (name.isEmpty()) return TQString::null; + if (name.isEmpty()) return TQString(); KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin"); for (uint ndx = 0; ndx < offers.count(); ++ndx) if (offers[ndx]->name() == name) return offers[ndx]->desktopEntryName(); - return TQString::null; + return TQString(); } /** @@ -505,13 +505,13 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode) */ /*static*/ TQString TalkerCode::TalkerDesktopEntryNameToName(const TQString& desktopEntryName) { - if (desktopEntryName.isEmpty()) return TQString::null; + if (desktopEntryName.isEmpty()) return TQString(); KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin", - TQString("DesktopEntryName == '%1'").arg(desktopEntryName)); + TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName)); if (offers.count() == 1) return offers[0]->name(); else - return TQString::null; + return TQString(); } diff --git a/kttsd/libkttsd/talkercode.h b/kttsd/libkttsd/talkercode.h index 70e8ee6..f8cbc16 100644 --- a/kttsd/libkttsd/talkercode.h +++ b/kttsd/libkttsd/talkercode.h @@ -26,7 +26,7 @@ #ifndef _TALKERCODE_H_ #define _TALKERCODE_H_ -// Qt includes. +// TQt includes. #include <tqstring.h> #include <kdemacros.h> #include "kdeexportfix.h" @@ -38,7 +38,7 @@ class KDE_EXPORT TalkerCode /** * Constructor. */ - TalkerCode(const TQString &code=TQString::null, bool normal=false); + TalkerCode(const TQString &code=TQString(), bool normal=false); /** * Copy Constructor. */ @@ -167,7 +167,7 @@ class KDE_EXPORT TalkerCode * Uses KTrader to convert a translated Synth Plugin Name to DesktopEntryName. * @param name The translated plugin name. From Name= line in .desktop file. * @return DesktopEntryName. The name of the .desktop file (less .desktop). - * TQString::null if not found. + * TQString() if not found. */ static TQString TalkerNameToDesktopEntryName(const TQString& name); diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp index 1050ec2..155f2aa 100644 --- a/kttsd/libkttsd/testplayer.cpp +++ b/kttsd/libkttsd/testplayer.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqfile.h> // KDE includes. @@ -44,9 +44,9 @@ /** * Constructor. */ -TestPlayer::TestPlayer(TQObject *parent, const char *name, +TestPlayer::TestPlayer(TQObject *tqparent, const char *name, const int playerOption, const float audioStretchFactor, const TQString &sinkName) : - TQObject(parent, name) + TQObject(tqparent, name) { m_playerOption = playerOption; m_audioStretchFactor = audioStretchFactor; @@ -103,7 +103,7 @@ void TestPlayer::play(const TQString &waveFile) m_stretcher = new Stretcher(); if (m_stretcher->stretch(playFile, tmpFile, m_audioStretchFactor)) { - while (m_stretcher->getState() != Stretcher::ssFinished) qApp->processEvents(); + while (m_stretcher->getState() != Stretcher::ssFinished) tqApp->processEvents(); playFile = m_stretcher->getOutFilename(); } delete m_stretcher; @@ -123,7 +123,7 @@ void TestPlayer::play(const TQString &waveFile) // cleaning up the play object. However, because we've been called from DCOP, // this seems to be necessary. The call to processEvents is problematic because // it can cause re-entrancy. - while (m_player->playing()) qApp->processEvents(); + while (m_player->playing()) tqApp->processEvents(); // kdDebug() << "TestPlayer::play: stopping playback." << endl; m_player->stop(); delete m_player; @@ -162,7 +162,7 @@ Player* TestPlayer::createPlayerObject(int playerOption) } } KTrader::OfferList offers = KTrader::self()->query( - "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").arg(plugInName)); + "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").tqarg(plugInName)); if(offers.count() == 1) { diff --git a/kttsd/libkttsd/testplayer.h b/kttsd/libkttsd/testplayer.h index f3e4e4b..c95c369 100644 --- a/kttsd/libkttsd/testplayer.h +++ b/kttsd/libkttsd/testplayer.h @@ -33,16 +33,16 @@ class Stretcher; // TODO: Make this work asynchronously. -class KDE_EXPORT TestPlayer : public QObject{ +class KDE_EXPORT TestPlayer : public TQObject{ public: /** * Constructor. * @param playerOption * @param audioStretchFactor */ - TestPlayer(TQObject *parent = 0, const char *name = 0, + TestPlayer(TQObject *tqparent = 0, const char *name = 0, const int playerOption = 0, const float audioStretchFactor = 1.0, - const TQString &sinkName = TQString::null); + const TQString &sinkName = TQString()); /** * Destructor. diff --git a/kttsd/libkttsd/utils.cpp b/kttsd/libkttsd/utils.cpp index ed9200b..df24e35 100644 --- a/kttsd/libkttsd/utils.cpp +++ b/kttsd/libkttsd/utils.cpp @@ -41,7 +41,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa if(doc.startsWith("<?xml")) { // Look for ?> and strip everything off from there to the start - effectively removing // <?xml...?> - int xmlStatementEnd = doc.find("?>"); + int xmlStatementEnd = doc.tqfind("?>"); if(xmlStatementEnd == -1) { kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n"; return false; @@ -51,7 +51,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa } // Take off leading comments, if they exist. while(doc.startsWith("<!--") || doc.startsWith(" <!--")) { - int commentStatementEnd = doc.find("-->"); + int commentStatementEnd = doc.tqfind("-->"); if(commentStatementEnd == -1) { kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n"; return false; @@ -61,7 +61,7 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa } // Take off the doctype statement if it exists. while(doc.startsWith("<!DOCTYPE") || doc.startsWith(" <!DOCTYPE")) { - int doctypeStatementEnd = doc.find(">"); + int doctypeStatementEnd = doc.tqfind(">"); if(doctypeStatementEnd == -1) { kdDebug() << "KttsUtils::hasRootElement: Bad XML file syntax\n"; return false; @@ -76,9 +76,9 @@ bool KttsUtils::hasRootElement(const TQString &xmldoc, const TQString &elementNa /** * Check if an XML document has a certain DOCTYPE. * @param xmldoc The document to check for the doctype. - * @param name The doctype name to check for. Pass TQString::null to not check the name. - * @param publicId The public ID to check for. Pass TQString::null to not check the ID. - * @param systemId The system ID to check for. Pass TQString::null to not check the ID. + * @param name The doctype name to check for. Pass TQString() to not check the name. + * @param publicId The public ID to check for. Pass TQString() to not check the ID. + * @param systemId The system ID to check for. Pass TQString() to not check the ID. * @returns True if the parameters match the doctype, false otherwise. */ bool KttsUtils::hasDoctype(const TQString &xmldoc, const TQString &name/*, const TQString &publicId, const TQString &systemId*/) { @@ -88,7 +88,7 @@ bool KttsUtils::hasDoctype(const TQString &xmldoc, const TQString &name/*, const if(doc.startsWith("<?xml")) { // Look for ?> and strip everything off from there to the start - effectively removing // <?xml...?> - int xmlStatementEnd = doc.find("?>"); + int xmlStatementEnd = doc.tqfind("?>"); if(xmlStatementEnd == -1) { kdDebug() << "KttsUtils::hasDoctype: Bad XML file syntax\n"; return false; @@ -99,7 +99,7 @@ bool KttsUtils::hasDoctype(const TQString &xmldoc, const TQString &name/*, const } // Take off leading comments, if they exist. while(doc.startsWith("<!--")) { - int commentStatementEnd = doc.find("-->"); + int commentStatementEnd = doc.tqfind("-->"); if(commentStatementEnd == -1) { kdDebug() << "KttsUtils::hasDoctype: Bad XML file syntax\n"; return false; diff --git a/kttsd/libkttsd/utils.h b/kttsd/libkttsd/utils.h index 62c4fc5..61711db 100644 --- a/kttsd/libkttsd/utils.h +++ b/kttsd/libkttsd/utils.h @@ -43,9 +43,9 @@ public: /** * Check if an XML document has a certain DOCTYPE. * @param xmldoc The document to check for the doctype. - * @param name The doctype name to check for. Pass TQString::null to not check the name. - * @param publicId The public ID to check for. Pass TQString::null to not check the ID. - * @param systemId The system ID to check for. Pass TQString::null to not check the ID. + * @param name The doctype name to check for. Pass TQString() to not check the name. + * @param publicId The public ID to check for. Pass TQString() to not check the ID. + * @param systemId The system ID to check for. Pass TQString() to not check the ID. * @returns true if the parameters match the doctype, false otherwise. */ static bool hasDoctype(const TQString &xmldoc, const TQString &name/*, const TQString &publicId, const TQString &systemId*/); diff --git a/kttsd/players/akodeplayer/akodeplayer.cpp b/kttsd/players/akodeplayer/akodeplayer.cpp index 13f6cf3..a0d38bb 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* parent, const char* name, const TQStringList& args) : - Player(parent, name, args), +aKodePlayer::aKodePlayer(TQObject* tqparent, const char* name, const TQStringList& args) : + Player(tqparent, name, args), m_player(0) {} diff --git a/kttsd/players/akodeplayer/akodeplayer.h b/kttsd/players/akodeplayer/akodeplayer.h index c003d13..13fe8de 100644 --- a/kttsd/players/akodeplayer/akodeplayer.h +++ b/kttsd/players/akodeplayer/akodeplayer.h @@ -31,9 +31,10 @@ namespace aKode { class KDE_EXPORT aKodePlayer : public Player { Q_OBJECT + TQ_OBJECT public: - aKodePlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + aKodePlayer(TQObject* tqparent = 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 72a242a..5c435d8 100644 --- a/kttsd/players/alsaplayer/alsaplayer.cpp +++ b/kttsd/players/alsaplayer/alsaplayer.cpp @@ -38,7 +38,7 @@ # endif #endif -// Qt includes. +// TQt includes. #include <tqdir.h> #include <tqapplication.h> #include <tqcstring.h> @@ -128,8 +128,8 @@ TQString AlsaPlayer::timestamp() const // public methods //////////////////////////////////////////////////////////////////////////////// -AlsaPlayer::AlsaPlayer(TQObject* parent, const char* name, const TQStringList& args) : - Player(parent, name, args), +AlsaPlayer::AlsaPlayer(TQObject* tqparent, const char* name, const TQStringList& args) : + Player(tqparent, name, args), m_currentVolume(1.0), m_pcmName("default"), m_defPeriodSize(128), @@ -432,10 +432,10 @@ TQStringList AlsaPlayer::getPluginList( const TQCString& /*classname*/ ) infoName += snd_pcm_info_get_name(pcminfo); infoName += ")"; if (0 == devCnt) { - TQString pcmName = TQString("default:%1").arg(card); + TQString pcmName = TQString("default:%1").tqarg(card); result.append(pcmName + infoName); } - TQString pcmName = TQString("plughw:%1,%2").arg(card).arg(device); + TQString pcmName = TQString("plughw:%1,%2").tqarg(card).tqarg(device); result.append(pcmName + infoName); } snd_ctl_close(handle); @@ -1001,7 +1001,7 @@ void AlsaPlayer::xrun() stream == SND_PCM_STREAM_PLAYBACK ? "underrun" : "overrun", diff.tv_sec * 1000 + diff.tv_usec / 1000.0); if (m_debugLevel >= 2) { - DBG("Status:"); + DBG("tqStatus:"); snd_pcm_status_dump(status, log); } if ((res = snd_pcm_prepare(handle))<0) { @@ -1011,7 +1011,7 @@ void AlsaPlayer::xrun() return; /* ok, data should be accepted again */ } if (SND_PCM_STATE_DRAINING == snd_pcm_status_get_state(status)) { if (m_debugLevel >= 2) { - DBG("Status(DRAINING):"); + DBG("tqStatus(DRAINING):"); snd_pcm_status_dump(status, log); } if (stream == SND_PCM_STREAM_CAPTURE) { @@ -1024,7 +1024,7 @@ void AlsaPlayer::xrun() } } if (m_debugLevel >= 2) { - DBG("Status(R/W):"); + DBG("tqStatus(R/W):"); snd_pcm_status_dump(status, log); } ERR("read/write error, state = %s", snd_pcm_state_name(snd_pcm_status_get_state(status))); @@ -1496,7 +1496,7 @@ void AlsaPlayer::header(int /*rtype*/, const char* /*name*/) else if (hwdata.channels == 2) channels = "Stereo"; else - channels = TQString("Channels %1").arg(hwdata.channels); + channels = TQString("Channels %1").tqarg(hwdata.channels); DBG("Format: %s, Rate %d Hz, %s", snd_pcm_format_description(hwdata.format), hwdata.rate, diff --git a/kttsd/players/alsaplayer/alsaplayer.h b/kttsd/players/alsaplayer/alsaplayer.h index d307060..7dedc87 100644 --- a/kttsd/players/alsaplayer/alsaplayer.h +++ b/kttsd/players/alsaplayer/alsaplayer.h @@ -28,7 +28,7 @@ #include <alsa/asoundlib.h> #include <sys/poll.h> -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqobject.h> #include <tqthread.h> @@ -63,12 +63,13 @@ static snd_pcm_sframes_t (*writei_func)(snd_pcm_t *handle, const void *buffer, s static snd_pcm_sframes_t (*readn_func)(snd_pcm_t *handle, void **bufs, snd_pcm_uframes_t size); static snd_pcm_sframes_t (*writen_func)(snd_pcm_t *handle, void **bufs, snd_pcm_uframes_t size); -class KDE_EXPORT AlsaPlayer : public Player, QThread +class KDE_EXPORT AlsaPlayer : public Player, TQThread { Q_OBJECT + TQ_OBJECT public: - AlsaPlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + AlsaPlayer(TQObject* tqparent = 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 9e6e771..63652de 100644 --- a/kttsd/players/artsplayer/artsplayer.cpp +++ b/kttsd/players/artsplayer/artsplayer.cpp @@ -40,8 +40,8 @@ // public methods //////////////////////////////////////////////////////////////////////////////// -ArtsPlayer::ArtsPlayer(TQObject* parent, const char* name, const TQStringList& args) : - Player(parent, name, args), +ArtsPlayer::ArtsPlayer(TQObject* tqparent, const char* name, const TQStringList& args) : + Player(tqparent, name, args), m_dispatcher(0), m_server(0), m_factory(0), @@ -234,7 +234,7 @@ void ArtsPlayer::setupArtsObjects() if(m_amanPlay->isNull() || !m_factory) { KMessageBox::error(0, i18n("Connecting/starting aRts soundserver failed. " "Make sure that artsd is configured properly.")); - qApp->exit(1); + tqApp->exit(1); } m_amanPlay->setTitle(i18n("kttsd")); diff --git a/kttsd/players/artsplayer/artsplayer.h b/kttsd/players/artsplayer/artsplayer.h index 879dccc..307999a 100644 --- a/kttsd/players/artsplayer/artsplayer.h +++ b/kttsd/players/artsplayer/artsplayer.h @@ -43,9 +43,10 @@ namespace KDE { class KDE_EXPORT ArtsPlayer : public Player { Q_OBJECT + TQ_OBJECT public: - ArtsPlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + ArtsPlayer(TQObject* tqparent = 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 4d56556..ae06557 100644 --- a/kttsd/players/gstplayer/gstreamerplayer.cpp +++ b/kttsd/players/gstplayer/gstreamerplayer.cpp @@ -12,7 +12,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqfile.h> // KDE includes. @@ -29,8 +29,8 @@ // public methods //////////////////////////////////////////////////////////////////////////////// -GStreamerPlayer::GStreamerPlayer(TQObject* parent, const char* name, const TQStringList& args) : - Player(parent, name, args), +GStreamerPlayer::GStreamerPlayer(TQObject* tqparent, const char* name, const TQStringList& args) : + Player(tqparent, name, args), m_initialized(false), m_pipeline(0), m_source(0), @@ -94,18 +94,18 @@ bool GStreamerPlayer::paused() const int GStreamerPlayer::totalTime() const { - return time(GST_QUERY_TOTAL) / GST_SECOND; + return time(GST_TQUERY_TOTAL) / GST_SECOND; } int GStreamerPlayer::currentTime() const { - return time(GST_QUERY_POSITION) / GST_SECOND; + return time(GST_TQUERY_POSITION) / GST_SECOND; } int GStreamerPlayer::position() const { - long long total = time(GST_QUERY_TOTAL); - long long current = time(GST_QUERY_POSITION); + long long total = time(GST_TQUERY_TOTAL); + long long current = time(GST_TQUERY_POSITION); return total > 0 ? int((double(current) / double(total)) * double(1000) + 0.5) : 0; } @@ -117,7 +117,7 @@ void GStreamerPlayer::seek(int seekTime) void GStreamerPlayer::seekPosition(int position) { - long long total = time(GST_QUERY_TOTAL); + long long total = time(GST_TQUERY_TOTAL); if(total > 0) seek(int(double(position) / double(1000) * double(totalTime()) + 0.5)); } @@ -189,12 +189,12 @@ bool GStreamerPlayer::requireVersion(uint major, uint minor, uint micro) } gst_version(&gmajor, &gminor, &gmicro); - // kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").arg(gmajor).arg(gminor).arg(gmicro) << endl; + // kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").tqarg(gmajor).tqarg(gminor).tqarg(gmicro) << endl; if (gmajor > major) return true; if (gminor > minor) return true; if (gmicro >= micro) return true; - kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").arg(gmajor).arg(gminor).arg(gmicro) << endl; - kdDebug() << TQString("GStreamerPlayer::requireVersion: This application requires %1.%2.%3 or greater.").arg(major).arg(minor).arg(micro) << endl; + kdDebug() << TQString("GStreamerPlayer::requireVersion: You have gstreamer %1.%2.%3 installed.").tqarg(gmajor).tqarg(gminor).tqarg(gmicro) << endl; + kdDebug() << TQString("GStreamerPlayer::requireVersion: This application requires %1.%2.%3 or greater.").tqarg(major).tqarg(minor).tqarg(micro) << endl; return false; } @@ -207,7 +207,7 @@ void GStreamerPlayer::setSinkName(const TQString &sinkName) { m_sinkName = sinkN void GStreamerPlayer::readConfig() { KConfigGroup config(KGlobal::config(), "GStreamerPlayer"); - m_sinkName = config.readEntry("SinkName", TQString::null); + m_sinkName = config.readEntry("SinkName", TQString()); } void GStreamerPlayer::setupPipeline() diff --git a/kttsd/players/gstplayer/gstreamerplayer.h b/kttsd/players/gstplayer/gstreamerplayer.h index 13701ab..066b493 100644 --- a/kttsd/players/gstplayer/gstreamerplayer.h +++ b/kttsd/players/gstplayer/gstreamerplayer.h @@ -28,9 +28,10 @@ extern "C" { class GStreamerPlayer : public Player { Q_OBJECT + TQ_OBJECT public: - GStreamerPlayer(TQObject* parent = 0, const char* name = 0, const TQStringList& args=TQStringList()); + GStreamerPlayer(TQObject* tqparent = 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 5d46fe9..5c4605f 100644 --- a/kttsd/plugins/command/commandconf.cpp +++ b/kttsd/plugins/command/commandconf.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqlayout.h> #include <tqcheckbox.h> #include <tqfile.h> @@ -41,18 +41,18 @@ #include "commandconf.h" /** Constructor */ -CommandConf::CommandConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : - PlugInConf(parent, name) +CommandConf::CommandConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInConf(tqparent, name) { // kdDebug() << "CommandConf::CommandConf: Running" << endl; m_commandProc = 0; m_progressDlg = 0; - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout"); - layout->setAlignment (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new CommandConfWidget(this, "CommandConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // Build codec list and fill combobox. m_codecList = PlugInProc::buildCodecList(); @@ -121,21 +121,21 @@ TQString CommandConf::getTalkerCode() { // Must contain either text or file parameter, or StdIn checkbox must be checked, // otherwise, does nothing! - if ((url.contains("%t") > 0) || (url.contains("%f") > 0) || m_widget->stdInButton->isChecked()) + if ((url.tqcontains("%t") > 0) || (url.tqcontains("%f") > 0) || m_widget->stdInButton->isChecked()) { return TQString( "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />" "<prosody volume=\"%4\" rate=\"%5\" />" "<kttsd synthesizer=\"%6\" />") - .arg(m_languageCode) - .arg("fixed") - .arg("neutral") - .arg("medium") - .arg("medium") - .arg("Command"); + .tqarg(m_languageCode) + .tqarg("fixed") + .tqarg("neutral") + .tqarg("medium") + .tqarg("medium") + .tqarg("Command"); } } - return TQString::null; + return TQString(); } void CommandConf::slotCommandTest_clicked() @@ -203,7 +203,7 @@ void CommandConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(m_waveFile); TQFile::remove(m_waveFile); - m_waveFile = TQString::null; + m_waveFile = TQString(); if (m_progressDlg) m_progressDlg->close(); } diff --git a/kttsd/plugins/command/commandconf.h b/kttsd/plugins/command/commandconf.h index b3889b9..4607718 100644 --- a/kttsd/plugins/command/commandconf.h +++ b/kttsd/plugins/command/commandconf.h @@ -18,7 +18,7 @@ #ifndef _COMMANDCONF_H_ #define _COMMANDCONF_H_ -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqstringlist.h> @@ -35,11 +35,12 @@ class CommandProc; class KProgressDialog; class CommandConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - CommandConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + CommandConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~CommandConf(); @@ -71,7 +72,7 @@ class CommandConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -89,7 +90,7 @@ class CommandConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui index b0b749c..7a45b20 100644 --- a/kttsd/plugins/command/commandconfwidget.ui +++ b/kttsd/plugins/command/commandconfwidget.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>CommandConfWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>CommandConfWidget</cstring> </property> @@ -22,7 +22,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>confiurationBox</cstring> </property> @@ -53,7 +53,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>urlLabel</cstring> </property> @@ -72,15 +72,15 @@ <string>This field specifies both the command used for speaking texts and its parameters. If you want to pass the text as a parameter, write %t at the place where the text should be inserted. To pass a file of the text, write %f. To synthesize only and let KTTSD play the synthesized text, write %w for the generated audio file.</string> </property> </widget> - <widget class="QLayoutWidget" row="5" column="0"> + <widget class="TQLayoutWidget" row="5" column="0"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>stdInButton</cstring> </property> @@ -101,14 +101,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>201</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>commandTestButton</cstring> </property> @@ -118,15 +118,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>characterCodingLabel</cstring> </property> @@ -163,7 +163,7 @@ </widget> </hbox> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>explanationLabel</cstring> </property> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>30</height> @@ -214,10 +214,10 @@ <include location="global" impldecl="in implementation">kpushbutton.h</include> <include location="global" impldecl="in implementation">kcombobox.h</include> </includes> -<signals> +<Q_SIGNALS> <signal>configurationChanged()</signal> -</signals> -<layoutdefaults spacing="6" margin="11"/> +</Q_SIGNALS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/plugins/command/commandproc.cpp b/kttsd/plugins/command/commandproc.cpp index 77d63f3..8f8c500 100644 --- a/kttsd/plugins/command/commandproc.cpp +++ b/kttsd/plugins/command/commandproc.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqfile.h> #include <tqstring.h> #include <tqvaluelist.h> @@ -39,8 +39,8 @@ #include "commandproc.moc" /** Constructor */ -CommandProc::CommandProc( TQObject* parent, const char* name, const TQStringList& /*args*/) : - PlugInProc( parent, name ) +CommandProc::CommandProc( TQObject* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInProc( tqparent, name ) { kdDebug() << "CommandProc::CommandProc: Running" << endl; m_commandProc = 0; @@ -72,8 +72,8 @@ bool CommandProc::init(KConfig *config, const TQString &configGroup){ m_stdin = config->readBoolEntry("StdIn", true); m_language = config->readEntry("LanguageCode", "en"); - // Support separate synthesis if the TTS command contains %w macro. - m_supportsSynth = (m_ttsCommand.contains("%w")); + // Support separate synthesis if the TTS command tqcontains %w macro. + m_supportsSynth = (m_ttsCommand.tqcontains("%w")); TQString codecString = config->readEntry("Codec", "Local"); m_codec = codecNameToCodec(codecString); @@ -89,7 +89,7 @@ bool CommandProc::init(KConfig *config, const TQString &configGroup){ */ void CommandProc::sayText(const TQString &text) { - synth(text, TQString::null, + synth(text, TQString(), m_ttsCommand, m_stdin, m_codec, m_language); } @@ -127,9 +127,9 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile if (m_commandProc->isRunning()) m_commandProc->kill(); delete m_commandProc; m_commandProc = 0; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); if (!m_textFilename.isNull()) TQFile::remove(m_textFilename); - m_textFilename = TQString::null; + m_textFilename = TQString(); } TQString command = userCmd; TQString text = inputText.stripWhiteSpace(); @@ -147,7 +147,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile TQString escText = KShellProcess::quote(text); // 1.c) create a temporary file for the text, if %f macro is used. - if (command.contains("%f")) + if (command.tqcontains("%f")) { KTempFile tempFile(locateLocal("tmp", "commandplugin-"), ".txt"); TQTextStream* fs = tempFile.textStream(); @@ -156,13 +156,13 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile *fs << endl; m_textFilename = tempFile.file()->name(); tempFile.close(); - } else m_textFilename = TQString::null; + } else m_textFilename = TQString(); // 2. replace variables with values TQValueStack<bool> stack; bool issinglequote=false; bool isdoublequote=false; - int noreplace=0; + int notqreplace=0; TQRegExp re_noquote("(\"|'|\\\\|`|\\$\\(|\\$\\{|\\(|\\{|\\)|\\}|%%|%t|%f|%l|%w)"); TQRegExp re_singlequote("('|%%|%t|%f|%l|%w)"); TQRegExp re_doublequote("(\"|\\\\|`|\\$\\(|\\$\\{|%%|%t|%f|%l|%w)"); @@ -178,18 +178,18 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile { // assert(isdoublequote == false) stack.push(isdoublequote); - if (noreplace > 0) + if (notqreplace > 0) // count nested braces when within ${...} - noreplace++; + notqreplace++; i++; } else if (command[i]=='$') { stack.push(isdoublequote); isdoublequote = false; - if ((noreplace > 0) || (command[i+1]=='{')) + if ((notqreplace > 0) || (command[i+1]=='{')) // count nested braces when within ${...} - noreplace++; + notqreplace++; i+=2; } else if ((command[i]==')') || (command[i]=='}')) @@ -199,9 +199,9 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile isdoublequote = stack.pop(); else qWarning("Parse error."); - if (noreplace > 0) + if (notqreplace > 0) // count nested braces when within ${...} - noreplace--; + notqreplace--; i++; } else if (command[i]=='\'') @@ -219,7 +219,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile else if (command[i]=='`') { // Replace all `...` with safer $(...) - command.replace (i, 1, "$("); + command.tqreplace (i, 1, "$("); TQRegExp re_backticks("(`|\\\\`|\\\\\\\\|\\\\\\$)"); for ( int i2=re_backticks.search(command,i+2); i2!=-1; @@ -228,7 +228,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile { if (command[i2] == '`') { - command.replace (i2, 1, ")"); + command.tqreplace (i2, 1, ")"); i2=command.length(); // leave loop } else @@ -239,7 +239,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile } // Leave i unchanged! We need to process "$(" } - else if (noreplace == 0) // do not replace macros within ${...} + else if (notqreplace == 0) // do not replace macros within ${...} { TQString match, v; @@ -269,7 +269,7 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile else if (issinglequote) v="'"+v+"'"; - command.replace (i, match.length(), v); + command.tqreplace (i, match.length(), v); i+=v.length(); } else @@ -382,13 +382,13 @@ void CommandProc::slotProcessExited(KProcess*) void CommandProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); kdDebug() << "CommandProc::slotReceivedStdout: Received output from Command: " << buf << endl; } void CommandProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); kdDebug() << "CommandProc::slotReceivedStderr: Received error from Command: " << buf << endl; } @@ -420,9 +420,9 @@ void CommandProc::ackFinished() if (m_state == psFinished) { m_state = psIdle; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); if (!m_textFilename.isNull()) TQFile::remove(m_textFilename); - m_textFilename = TQString::null; + m_textFilename = TQString(); } } diff --git a/kttsd/plugins/command/commandproc.h b/kttsd/plugins/command/commandproc.h index c1880be..0faf1f4 100644 --- a/kttsd/plugins/command/commandproc.h +++ b/kttsd/plugins/command/commandproc.h @@ -18,7 +18,7 @@ #ifndef _COMMANDPROC_H_ #define _COMMANDPROC_H_ -// Qt includes. +// TQt includes. #include <tqstringlist.h> // KTTS includes. @@ -28,11 +28,12 @@ class KProcess; class TQTextCodec; class CommandProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - CommandProc( TQObject* parent = 0, const char* name = 0, + CommandProc( TQObject* tqparent = 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 8b5ccf0..b3cd27d 100644 --- a/kttsd/plugins/epos/eposconf.cpp +++ b/kttsd/plugins/epos/eposconf.cpp @@ -24,7 +24,7 @@ // C++ includes. #include <math.h> -// Qt includes. +// TQt includes. #include <tqfile.h> #include <tqapplication.h> #include <tqtextcodec.h> @@ -48,18 +48,18 @@ #include "eposconf.moc" /** Constructor */ -EposConf::EposConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : - PlugInConf(parent, name) +EposConf::EposConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInConf(tqparent, name) { // kdDebug() << "EposConf::EposConf: Running" << endl; m_eposProc = 0; m_progressDlg = 0; - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "EposConfigWidgetLayout"); - layout->setAlignment (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new EposConfWidget(this, "EposConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); // Build codec list and fill combobox. m_codecList = PlugInProc::buildCodecList(); @@ -194,15 +194,15 @@ TQString EposConf::getTalkerCode() "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />" "<prosody volume=\"%4\" rate=\"%5\" />" "<kttsd synthesizer=\"%6\" />") - .arg(m_languageCode) - .arg("fixed") - .arg("neutral") - .arg("medium") - .arg(rate) - .arg("Epos TTS Synthesis System"); + .tqarg(m_languageCode) + .tqarg("fixed") + .tqarg("neutral") + .tqarg("medium") + .tqarg(rate) + .tqarg("Epos TTS Synthesis System"); } } - return TQString::null; + return TQString(); } void EposConf::slotEposTest_clicked() @@ -275,7 +275,7 @@ void EposConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(m_waveFile); TQFile::remove(m_waveFile); - m_waveFile = TQString::null; + m_waveFile = TQString(); if (m_progressDlg) m_progressDlg->close(); } diff --git a/kttsd/plugins/epos/eposconf.h b/kttsd/plugins/epos/eposconf.h index 08cb611..667d445 100644 --- a/kttsd/plugins/epos/eposconf.h +++ b/kttsd/plugins/epos/eposconf.h @@ -24,7 +24,7 @@ #ifndef _EPOSCONF_H_ #define _EPOSCONF_H_ -// Qt includes. +// TQt includes. #include <tqstring.h> // KDE includes. @@ -42,11 +42,12 @@ class EposProc; class KProgressDialog; class EposConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - EposConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + EposConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~EposConf(); @@ -78,7 +79,7 @@ class EposConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -96,7 +97,7 @@ class EposConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui index 23e47da..3cc032e 100644 --- a/kttsd/plugins/epos/eposconfwidget.ui +++ b/kttsd/plugins/epos/eposconfwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>EposConfWidget</class> <author>Gary Cramblitt</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>EposConfWidget</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>eposConfigurationBox</cstring> </property> @@ -65,15 +65,15 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>characterCodingLabel</cstring> </property> @@ -110,23 +110,23 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>timeLabel</cstring> </property> @@ -148,7 +148,7 @@ <string>Sets the speed of speech. Slide the slider to the left to slow speech down; to the right to increase talking speed. Anything less than 75 percent is considered "slow", and anything greater than 125 percent is considered "fast".</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>frequencyLabel</cstring> </property> @@ -172,9 +172,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <vbox> <property name="name"> @@ -244,15 +244,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>timeSlider</cstring> </property> @@ -281,7 +281,7 @@ <string>Sets the speed of speech. Slide the slider to the left to slow speech down; to the right to increase talking speed. Anything less than 75 percent is considered "slow", and anything greater than 125 percent is considered "fast".</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>frequencySlider</cstring> </property> @@ -314,23 +314,23 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>eposServerPathLabel</cstring> </property> @@ -345,7 +345,7 @@ <property name="text"> <string>Epos server executable path:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -355,7 +355,7 @@ <string>If the Epos server program will be found due to your PATH environment variable, simply enter "epos", otherwise enter the full path to the Epos server executable program.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>eposClientPathLabel</cstring> </property> @@ -370,7 +370,7 @@ <property name="text"> <string>Epos client executable path:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter</set> </property> <property name="buddy" stdset="0"> @@ -382,9 +382,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> @@ -432,7 +432,7 @@ </widget> </hbox> </widget> - <widget class="QGroupBox" row="3" column="0"> + <widget class="TQGroupBox" row="3" column="0"> <property name="name"> <cstring>advancedGroupBox</cstring> </property> @@ -443,23 +443,23 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>eposServerOptions</cstring> </property> @@ -467,7 +467,7 @@ <string>Optional. Enter any server command line options here. To see available options, enter "epos -h" in a terminal. Do not use "-o".</string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>eposClientOptions</cstring> </property> @@ -477,15 +477,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>layout12</cstring> + <cstring>tqlayout12</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>eposServerOptionsLabel</cstring> </property> @@ -500,7 +500,7 @@ <property name="text"> <string>Epos server:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> @@ -510,7 +510,7 @@ <string>Optional. Enter any server command line options here. To see available options, enter "epos -h" in a terminal. Do not use "-o".</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>eposClientOptionsLabel</cstring> </property> @@ -525,7 +525,7 @@ <property name="text"> <string>Epos client:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignLeft</set> </property> <property name="buddy" stdset="0"> @@ -541,9 +541,9 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> @@ -559,14 +559,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>410</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>eposTest</cstring> </property> @@ -595,7 +595,7 @@ <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>knuminput.h</includehint> diff --git a/kttsd/plugins/epos/eposproc.cpp b/kttsd/plugins/epos/eposproc.cpp index e5fd664..ae7973c 100644 --- a/kttsd/plugins/epos/eposproc.cpp +++ b/kttsd/plugins/epos/eposproc.cpp @@ -25,7 +25,7 @@ // C++ includes. #include <math.h> -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqstringlist.h> #include <tqtextcodec.h> @@ -43,8 +43,8 @@ #include "eposproc.moc" /** Constructor */ -EposProc::EposProc( TQObject* parent, const char* name, const TQStringList& ) : - PlugInProc( parent, name ){ +EposProc::EposProc( TQObject* tqparent, const char* name, const TQStringList& ) : + PlugInProc( tqparent, name ){ kdDebug() << "EposProc::EposProc: Running" << endl; m_state = psIdle; m_waitingStop = false; @@ -72,11 +72,11 @@ bool EposProc::init(KConfig* config, const TQString& configGroup) config->setGroup(configGroup); m_eposServerExePath = config->readEntry("EposServerExePath", "epos"); m_eposClientExePath = config->readEntry("EposClientExePath", "say"); - m_eposLanguage = config->readEntry("Language", TQString::null); + m_eposLanguage = config->readEntry("Language", TQString()); m_time = config->readNumEntry("time", 100); m_pitch = config->readNumEntry("pitch", 100); - m_eposServerOptions = config->readEntry("EposServerOptions", TQString::null); - m_eposClientOptions = config->readEntry("EposClientOptions", TQString::null); + m_eposServerOptions = config->readEntry("EposServerOptions", TQString()); + m_eposClientOptions = config->readEntry("EposClientOptions", TQString()); kdDebug() << "EposProc::init: path to epos server: " << m_eposServerExePath << endl; kdDebug() << "EposProc::init: path to epos client: " << m_eposClientExePath << endl; @@ -109,7 +109,7 @@ bool EposProc::init(KConfig* config, const TQString& configGroup) */ void EposProc::sayText(const TQString &text) { - synth(text, TQString::null, m_eposServerExePath, m_eposClientExePath, + synth(text, TQString(), m_eposServerExePath, m_eposClientExePath, m_eposServerOptions, m_eposClientOptions, m_codec, m_eposLanguage, m_time, m_pitch); } @@ -210,7 +210,7 @@ void EposProc::synth( *m_eposProc << eposClientExePath; // Language. if (!eposLanguage.isEmpty()) - *m_eposProc << TQString("--language=%1").arg(eposLanguage); + *m_eposProc << TQString("--language=%1").tqarg(eposLanguage); // Rate (speed). // Map 50% to 200% onto 0 to 1000. // slider = alpha * (log(percent)-log(50)) @@ -221,10 +221,10 @@ void EposProc::synth( slider = slider - 500; // Map -500 to 500 onto 45 to -45 then shift to 130 to 40 (85 midpoint). float stretchValue = (-float(slider) * 45.0 / 500.0) + 85.0; - TQString timeMsg = TQString("--init_t=%1").arg(stretchValue, 0, 'f', 3); + TQString timeMsg = TQString("--init_t=%1").tqarg(stretchValue, 0, 'f', 3); *m_eposProc << timeMsg; // Pitch. Map 50% to 200% onto 50 to 200. easy. - TQString pitchMsg = TQString("--init_f=%1").arg(pitch); + TQString pitchMsg = TQString("--init_f=%1").tqarg(pitch); *m_eposProc << pitchMsg; // Output file. if (!suggestedFilename.isEmpty()) @@ -326,13 +326,13 @@ void EposProc::slotProcessExited(KProcess*) void EposProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); kdDebug() << "EposProc::slotReceivedStdout: Received output from Epos: " << buf << endl; } void EposProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); kdDebug() << "EposProc::slotReceivedStderr: Received error from Epos: " << buf << endl; } @@ -365,7 +365,7 @@ void EposProc::ackFinished() if (m_state == psFinished) { m_state = psIdle; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); } } diff --git a/kttsd/plugins/epos/eposproc.h b/kttsd/plugins/epos/eposproc.h index b12783a..0689481 100644 --- a/kttsd/plugins/epos/eposproc.h +++ b/kttsd/plugins/epos/eposproc.h @@ -25,7 +25,7 @@ #ifndef _EPOSPROC_H_ #define _EPOSPROC_H_ -// Qt includes. +// TQt includes. #include <tqstringlist.h> #include <tqmutex.h> @@ -36,13 +36,14 @@ class KProcess; class TQTextCodec; class EposProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - EposProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + EposProc( TQObject* tqparent = 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 8464ad7..54542ab 100644 --- a/kttsd/plugins/festivalint/festivalintconf.cpp +++ b/kttsd/plugins/festivalint/festivalintconf.cpp @@ -24,7 +24,7 @@ // C++ includes. #include <math.h> -// Qt includes. +// TQt includes. #include <tqlayout.h> #include <tqlabel.h> #include <tqstring.h> @@ -57,19 +57,19 @@ #include "festivalintconf.moc" /** Constructor */ -FestivalIntConf::FestivalIntConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : - PlugInConf(parent, name) +FestivalIntConf::FestivalIntConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInConf(tqparent, name) { // kdDebug() << "FestivalIntConf::FestivalIntConf: Running" << endl; m_festProc = 0; m_progressDlg = 0; m_supportsSSML = FestivalIntProc::ssUnknown; - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "FestivalIntConfigWidgetLayout"); - layout->setAlignment (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new FestivalIntConfWidget(this, "FestivalIntConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); m_widget->festivalPath->setMode(KFile::File | KFile::ExistingOnly); m_widget->festivalPath->setFilter("*"); @@ -210,11 +210,11 @@ void FestivalIntConf::setDesiredLanguage(const TQString &lang) TQString FestivalIntConf::getTalkerCode() { - if (!m_widget->selectVoiceCombo->isEnabled()) return TQString::null; + if (!m_widget->selectVoiceCombo->isEnabled()) return TQString(); TQString exePath = realFilePath(m_widget->festivalPath->url()); - if (exePath.isEmpty()) return TQString::null; - if (getLocation(exePath).isEmpty()) return TQString::null; - if (m_voiceList.count() == 0) return TQString::null; + if (exePath.isEmpty()) return TQString(); + if (getLocation(exePath).isEmpty()) return TQString(); + if (m_voiceList.count() == 0) return TQString(); TQString normalTalkerCode; voiceStruct voiceTemp = m_voiceList[m_widget->selectVoiceCombo->currentItem()]; // Determine volume attribute. soft < 75% <= medium <= 125% < loud. @@ -229,12 +229,12 @@ TQString FestivalIntConf::getTalkerCode() "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />" "<prosody volume=\"%4\" rate=\"%5\" />" "<kttsd synthesizer=\"%6\" />") - .arg(voiceTemp.languageCode) - .arg(voiceTemp.code) - .arg(voiceTemp.gender) - .arg(volume) - .arg(rate) - .arg("Festival Interactive"); + .tqarg(voiceTemp.languageCode) + .tqarg(voiceTemp.code) + .tqarg(voiceTemp.gender) + .tqarg(volume) + .tqarg(rate) + .tqarg("Festival Interactive"); return normalTalkerCode; } @@ -485,7 +485,7 @@ void FestivalIntConf::scanVoices() for (uint index=0; index < voicesCount; ++index) { TQDomNode voiceNode = voices.item(index); - TQString voiceCode = readXmlString(voiceNode, "code", TQString::null); + TQString voiceCode = readXmlString(voiceNode, "code", TQString()); // kdDebug() << "FestivalIntConf::scanVoices: Comparing code " << code << " to " << voiceCode << endl; if (voiceCode == code) { @@ -621,7 +621,7 @@ void FestivalIntConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(m_waveFile); TQFile::remove(m_waveFile); - m_waveFile = TQString::null; + m_waveFile = TQString(); if (m_progressDlg) m_progressDlg->close(); } diff --git a/kttsd/plugins/festivalint/festivalintconf.h b/kttsd/plugins/festivalint/festivalintconf.h index 5282394..3379719 100644 --- a/kttsd/plugins/festivalint/festivalintconf.h +++ b/kttsd/plugins/festivalint/festivalintconf.h @@ -24,7 +24,7 @@ #ifndef _FESTIVALINTCONF_H_ #define _FESTIVALINTCONF_H_ -// Qt includes. +// TQt includes. #include <tqstringlist.h> #include <tqvaluelist.h> @@ -55,11 +55,12 @@ typedef struct voiceStruct{ } voice; class FestivalIntConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - FestivalIntConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FestivalIntConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FestivalIntConf(); @@ -90,7 +91,7 @@ class FestivalIntConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -108,7 +109,7 @@ class FestivalIntConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui index f8b33fb..36f65bd 100644 --- a/kttsd/plugins/festivalint/festivalintconfwidget.ui +++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FestivalIntConfWidget</class> <author>Gary Cramblitt <garycramblitt@comcast.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FestivalIntConfWidget</cstring> </property> @@ -31,7 +31,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>festivalConfigurationBox</cstring> </property> @@ -65,7 +65,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>voicesPathBox</cstring> </property> @@ -79,7 +79,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>festivalPathLabel</cstring> </property> @@ -94,7 +94,7 @@ <property name="text"> <string>&Festival executable:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -122,7 +122,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>selectVoiceBox</cstring> </property> @@ -136,14 +136,14 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>selectVoiceLabel</cstring> </property> <property name="text"> <string>&Select voice:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -180,23 +180,23 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout11</cstring> + <cstring>tqlayout11</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout8</cstring> + <cstring>tqlayout8</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>volumeLabel</cstring> </property> @@ -218,7 +218,7 @@ <string>Sets the volume (loudness) of speech. Slide the slider to the left to lower the volume; to the right to increase volume. Anything less than 75 percent is considered "soft", and anything greater than 125 percent is considered "loud".</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>timeLabel</cstring> </property> @@ -240,7 +240,7 @@ <string>Sets the speed of speech. Slide the slider to the left to slow speech down; to the right to increase talking speed. Anything less than 75 percent is considered "slow", and anything greater than 125 percent is considered "fast". You cannot change the speed of MultiSyn voices.</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>frequencyLabel</cstring> </property> @@ -264,9 +264,9 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <vbox> <property name="name"> @@ -367,15 +367,15 @@ </widget> </vbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>volumeSlider</cstring> </property> @@ -407,7 +407,7 @@ <string>Sets the volume (loudness) of speech. Slide the slider to the left to lower the volume; to the right to increase volume. Anything less than 75 percent is considered "soft", and anything greater than 125 percent is considered "loud".</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>timeSlider</cstring> </property> @@ -436,7 +436,7 @@ <string>Sets the speed of speech. Slide the slider to the left to slow speech down; to the right to increase talking speed. Anything less than 75 percent is considered "slow", and anything greater than 125 percent is considered "fast". You cannot change the speed of MultiSyn voices.</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>frequencySlider</cstring> </property> @@ -469,15 +469,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>preloadCheckBox</cstring> </property> @@ -498,14 +498,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>101</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>testButton</cstring> </property> @@ -518,15 +518,15 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>characterCodingLabel</cstring> </property> @@ -583,7 +583,7 @@ <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/plugins/festivalint/festivalintproc.cpp b/kttsd/plugins/festivalint/festivalintproc.cpp index e48f2c4..2b4aea3 100644 --- a/kttsd/plugins/festivalint/festivalintproc.cpp +++ b/kttsd/plugins/festivalint/festivalintproc.cpp @@ -24,7 +24,7 @@ // C++ includes. #include <math.h> -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqstringlist.h> #include <tqthread.h> @@ -43,8 +43,8 @@ #include "festivalintproc.moc" /** Constructor */ -FestivalIntProc::FestivalIntProc( TQObject* parent, const char* name, const TQStringList& ) : - PlugInProc( parent, name ){ +FestivalIntProc::FestivalIntProc( TQObject* tqparent, const char* name, const TQStringList& ) : + PlugInProc( tqparent, name ){ // kdDebug() << "FestivalIntProc::FestivalIntProc: Running" << endl; m_ready = true; m_writingStdin = false; @@ -113,7 +113,7 @@ bool FestivalIntProc::init(KConfig *config, const TQString &configGroup) */ void FestivalIntProc::sayText(const TQString &text) { - synth(m_festivalExePath, text, TQString::null, m_voiceCode, m_time, m_pitch, m_volume, + synth(m_festivalExePath, text, TQString(), m_voiceCode, m_time, m_pitch, m_volume, m_languageCode, m_codec); } @@ -144,7 +144,7 @@ bool FestivalIntProc::queryVoices(const TQString &festivalExePath) // kdDebug() << "FestivalIntProc::queryVoices: Running" << endl; if (m_state != psIdle && m_waitingQueryVoices && m_waitingStop) return false; // Start Festival if not already running. - startEngine(festivalExePath, TQString::null, m_languageCode, m_codec); + startEngine(festivalExePath, TQString(), m_languageCode, m_codec); // Set state, waiting for voice codes list from Festival. m_waitingQueryVoices = true; // Voice rab_diphone is needed in order to support SSML. @@ -196,7 +196,7 @@ void FestivalIntProc::startEngine(const TQString &festivalExePath, const TQStrin if (!m_festProc->isRunning()) { // kdDebug() << "FestivalIntProc::startEngine: Starting Festival process" << endl; - m_runningVoiceCode = TQString::null; + m_runningVoiceCode = TQString(); m_runningTime = 100; m_runningPitch = 100; m_ready = false; @@ -257,7 +257,7 @@ void FestivalIntProc::synth( // If we just started Festival, or rate changed, tell festival. if (m_runningTime != time) { TQString timeMsg; - if (voiceCode.contains("_hts") > 0) + if (voiceCode.tqcontains("_hts") > 0) { // Map 50% to 200% onto 0 to 1000. // slider = alpha * (log(percent)-log(50)) @@ -268,11 +268,11 @@ void FestivalIntProc::synth( slider = slider - 500; // Map -500 to 500 onto 0.15 to -0.15. float stretchValue = -float(slider) * 0.15 / 500.0; - timeMsg = TQString("(set! hts_duration_stretch %1)").arg( + timeMsg = TQString("(set! hts_duration_stretch %1)").tqarg( stretchValue, 0, 'f', 3); } else - timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").arg( + timeMsg = TQString("(Parameter.set 'Duration_Stretch %1)").tqarg( 1.0/(float(time)/100.0), 0, 'f', 2); sendToFestival(timeMsg); m_runningTime = time; @@ -292,7 +292,7 @@ void FestivalIntProc::synth( } TQString pitchMsg = TQString( "(set! int_lr_params '((target_f0_mean %1) (target_f0_std 14)" - "(model_f0_mean 170) (model_f0_std 34)))").arg(pitchValue, 0, 10); + "(model_f0_mean 170) (model_f0_std 34)))").tqarg(pitchValue, 0, 10); sendToFestival(pitchMsg); m_runningPitch = pitch; } @@ -304,14 +304,14 @@ void FestivalIntProc::synth( int len = saidText.length(); while (len > c_tooLong) { - len = saidText.findRev(", ", len - (c_tooLong * 2 / 3), true); + len = saidText.tqfindRev(", ", len - (c_tooLong * 2 / 3), true); if (len != -1) { TQString c = saidText.mid(len+2, 1); if (c != c.upper()) { - saidText.replace(len, 2, ". "); - saidText.replace(len+2, 1, c.upper()); + saidText.tqreplace(len, 2, ". "); + saidText.tqreplace(len+2, 1, c.upper()); kdDebug() << "FestivalIntProc::synth: Splitting long sentence at " << len << endl; // kdDebug() << saidText << endl; } @@ -319,17 +319,17 @@ void FestivalIntProc::synth( } // Encode quotation characters. - saidText.replace("\\\"", "#!#!"); - saidText.replace("\"", "\\\""); - saidText.replace("#!#!", "\\\""); + saidText.tqreplace("\\\"", "#!#!"); + saidText.tqreplace("\"", "\\\""); + saidText.tqreplace("#!#!", "\\\""); // Remove certain comment characters. - saidText.replace("--", ""); + saidText.tqreplace("--", ""); // Ok, let's rock. if (synthFilename.isNull()) { m_state = psSaying; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); // kdDebug() << "FestivalIntProc::synth: Saying text: '" << saidText << "' using Festival plug in with voice " // << voiceCode << endl; saidText = "(SayText \"" + saidText + "\")"; @@ -500,9 +500,9 @@ void FestivalIntProc::slotProcessExited(KProcess*) void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); // kdDebug() << "FestivalIntProc::slotReceivedStdout: Received from Festival: " << buf << endl; - bool promptSeen = (buf.contains("festival>") > 0); + bool promptSeen = (buf.tqcontains("festival>") > 0); bool emitQueryVoicesFinished = false; TQStringList voiceCodesList; if (m_waitingQueryVoices && m_outputQueue.isEmpty()) @@ -515,7 +515,7 @@ void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) } else { if (buf.left(1) == "(") { - int rightParen = buf.find(')'); + int rightParen = buf.tqfind(')'); if (rightParen > 0) { m_waitingQueryVoices = false; @@ -562,14 +562,14 @@ void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) if (emitQueryVoicesFinished) { // kdDebug() << "FestivalIntProc::slotReceivedStdout: emitting queryVoicesFinished" << endl; - m_supportsSSML = (voiceCodesList.contains("rab_diphone")) ? ssYes : ssNo; + m_supportsSSML = (voiceCodesList.tqcontains("rab_diphone")) ? ssYes : ssNo; emit queryVoicesFinished(voiceCodesList); } } void FestivalIntProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); kdDebug() << "FestivalIntProc::slotReceivedStderr: Received error from Festival: " << buf << endl; } @@ -620,7 +620,7 @@ void FestivalIntProc::ackFinished() if (m_state == psFinished) { m_state = psIdle; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); } } diff --git a/kttsd/plugins/festivalint/festivalintproc.h b/kttsd/plugins/festivalint/festivalintproc.h index 4425245..e70127f 100644 --- a/kttsd/plugins/festivalint/festivalintproc.h +++ b/kttsd/plugins/festivalint/festivalintproc.h @@ -34,7 +34,8 @@ class TQTextCodec; class FestivalIntProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: enum SupportsSSML { @@ -46,7 +47,7 @@ class FestivalIntProc : public PlugInProc{ /** * Constructor */ - FestivalIntProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FestivalIntProc( TQObject* tqparent = 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 0dfb6d1..060e45c 100644 --- a/kttsd/plugins/flite/fliteconf.cpp +++ b/kttsd/plugins/flite/fliteconf.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqlayout.h> #include <tqfile.h> #include <tqapplication.h> @@ -42,18 +42,18 @@ #include "fliteconf.moc" /** Constructor */ -FliteConf::FliteConf( TQWidget* parent, const char* name, const TQStringList& /*args*/) : - PlugInConf(parent, name) +FliteConf::FliteConf( TQWidget* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInConf(tqparent, name) { // kdDebug() << "FliteConf::FliteConf: Running" << endl; m_fliteProc = 0; m_progressDlg = 0; - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "FliteConfigWidgetLayout"); - layout->setAlignment (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new FliteConfWidget(this, "FliteConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); defaults(); @@ -74,7 +74,7 @@ void FliteConf::load(KConfig *config, const TQString &configGroup){ // kdDebug() << "FliteConf::load: Loading configuration for language " << langGroup << " with plug in " << "Festival Lite (flite)" << endl; config->setGroup(configGroup); - TQString fliteExe = config->readEntry("FliteExePath", TQString::null); + TQString fliteExe = config->readEntry("FliteExePath", TQString()); if (fliteExe.isEmpty()) { config->setGroup("Flite"); @@ -115,15 +115,15 @@ TQString FliteConf::getTalkerCode() "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />" "<prosody volume=\"%4\" rate=\"%5\" />" "<kttsd synthesizer=\"%6\" />") - .arg(m_languageCode) - .arg("fixed") - .arg("neutral") - .arg("medium") - .arg("medium") - .arg("Festival Lite (flite)"); + .tqarg(m_languageCode) + .tqarg("fixed") + .tqarg("neutral") + .tqarg("medium") + .tqarg("medium") + .tqarg("Festival Lite (flite)"); } } - return TQString::null; + return TQString(); } void FliteConf::slotFliteTest_clicked() @@ -187,7 +187,7 @@ void FliteConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(m_waveFile); TQFile::remove(m_waveFile); - m_waveFile = TQString::null; + m_waveFile = TQString(); if (m_progressDlg) m_progressDlg->close(); } diff --git a/kttsd/plugins/flite/fliteconf.h b/kttsd/plugins/flite/fliteconf.h index 6d5ff06..75e3b89 100644 --- a/kttsd/plugins/flite/fliteconf.h +++ b/kttsd/plugins/flite/fliteconf.h @@ -24,7 +24,7 @@ #ifndef _FLITECONF_H_ #define _FLITECONF_H_ -// Qt includes. +// TQt includes. #include <tqstring.h> // KDE includes. @@ -41,11 +41,12 @@ class FliteProc; class KProgressDialog; class FliteConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - FliteConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FliteConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FliteConf(); @@ -77,7 +78,7 @@ class FliteConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -95,7 +96,7 @@ class FliteConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui index 839970e..1e8e0be 100644 --- a/kttsd/plugins/flite/fliteconfwidget.ui +++ b/kttsd/plugins/flite/fliteconfwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FliteConfWidget</class> <author>Gary Cramblitt</author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FliteConfWidget</cstring> </property> @@ -41,14 +41,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>100</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>fliteConfigurationBox</cstring> </property> @@ -82,7 +82,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>flitePathBox</cstring> </property> @@ -96,7 +96,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flitePathLabel</cstring> </property> @@ -111,7 +111,7 @@ <property name="text"> <string>&Flite executable path:</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -142,7 +142,7 @@ </widget> </hbox> </widget> - <widget class="QPushButton" row="1" column="1"> + <widget class="TQPushButton" row="1" column="1"> <property name="name"> <cstring>fliteTest</cstring> </property> @@ -160,7 +160,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>221</width> <height>20</height> @@ -177,7 +177,7 @@ <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/plugins/flite/fliteproc.cpp b/kttsd/plugins/flite/fliteproc.cpp index 55cb0fa..b71efef 100644 --- a/kttsd/plugins/flite/fliteproc.cpp +++ b/kttsd/plugins/flite/fliteproc.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ******************************************************************************/ -// Qt includes. +// TQt includes. #include <tqstring.h> #include <tqstringlist.h> @@ -36,8 +36,8 @@ #include "fliteproc.moc" /** Constructor */ -FliteProc::FliteProc( TQObject* parent, const char* name, const TQStringList& ) : - PlugInProc( parent, name ){ +FliteProc::FliteProc( TQObject* tqparent, const char* name, const TQStringList& ) : + PlugInProc( tqparent, name ){ kdDebug() << "FliteProc::FliteProc: Running" << endl; m_state = psIdle; m_waitingStop = false; @@ -73,7 +73,7 @@ bool FliteProc::init(KConfig* config, const TQString& configGroup){ */ void FliteProc::sayText(const TQString &text) { - synth(text, TQString::null, m_fliteExePath); + synth(text, TQString(), m_fliteExePath); } /** @@ -129,11 +129,11 @@ void FliteProc::synth( // Encode quotation characters. TQString saidText = text; /* - saidText.replace("\\\"", "#!#!"); - saidText.replace("\"", "\\\""); - saidText.replace("#!#!", "\\\""); + saidText.tqreplace("\\\"", "#!#!"); + saidText.tqreplace("\"", "\\\""); + saidText.tqreplace("#!#!", "\\\""); // Remove certain comment characters. - saidText.replace("--", ""); + saidText.tqreplace("--", ""); saidText = "\"" + saidText + "\""; */ saidText += "\n"; @@ -218,13 +218,13 @@ void FliteProc::slotProcessExited(KProcess*) void FliteProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); kdDebug() << "FliteProc::slotReceivedStdout: Received output from Flite: " << buf << endl; } void FliteProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); kdDebug() << "FliteProc::slotReceivedStderr: Received error from Flite: " << buf << endl; } @@ -256,7 +256,7 @@ void FliteProc::ackFinished() if (m_state == psFinished) { m_state = psIdle; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); } } diff --git a/kttsd/plugins/flite/fliteproc.h b/kttsd/plugins/flite/fliteproc.h index a956d5c..6b44e45 100644 --- a/kttsd/plugins/flite/fliteproc.h +++ b/kttsd/plugins/flite/fliteproc.h @@ -24,7 +24,7 @@ #ifndef _FLITEPROC_H_ #define _FLITEPROC_H_ -// Qt includes. +// TQt includes. #include <tqstringlist.h> #include <tqmutex.h> @@ -34,13 +34,14 @@ class KProcess; class FliteProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - FliteProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FliteProc( TQObject* tqparent = 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 05c1fab..1da6f44 100644 --- a/kttsd/plugins/freetts/freettsconf.cpp +++ b/kttsd/plugins/freetts/freettsconf.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqlayout.h> #include <tqlabel.h> #include <tqstring.h> @@ -40,18 +40,18 @@ #include "freettsconfigwidget.h" /** Constructor */ -FreeTTSConf::FreeTTSConf( TQWidget* parent, const char* name, const TQStringList&/*args*/) : - PlugInConf( parent, name ) { +FreeTTSConf::FreeTTSConf( TQWidget* tqparent, const char* name, const TQStringList&/*args*/) : + PlugInConf( tqparent, name ) { // kdDebug() << "FreeTTSConf::FreeTTSConf: Running" << endl; m_freettsProc = 0; m_progressDlg = 0; - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint(), "FreeTTSConfigWidgetLayout"); - layout->setAlignment (Qt::AlignTop); + tqlayout->tqsetAlignment (TQt::AlignTop); m_widget = new FreeTTSConfWidget(this, "FreeTTSConfigWidget"); - layout->addWidget(m_widget); + tqlayout->addWidget(m_widget); defaults(); @@ -72,11 +72,11 @@ void FreeTTSConf::load(KConfig *config, const TQString &configGroup) { // kdDebug() << "FreeTTSConf::load: Running" << endl; config->setGroup(configGroup); - TQString freeTTSJar = config->readEntry("FreeTTSJarPath", TQString::null); + TQString freeTTSJar = config->readEntry("FreeTTSJarPath", TQString()); if (freeTTSJar.isEmpty()) { config->setGroup("FreeTTS"); - freeTTSJar = config->readEntry("FreeTTSJarPath", TQString::null); + freeTTSJar = config->readEntry("FreeTTSJarPath", TQString()); } if (freeTTSJar.isEmpty()) freeTTSJar = getLocation("freetts.jar"); @@ -119,15 +119,15 @@ TQString FreeTTSConf::getTalkerCode() "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />" "<prosody volume=\"%4\" rate=\"%5\" />" "<kttsd synthesizer=\"%6\" />") - .arg(m_languageCode) - .arg("fixed") - .arg("neutral") - .arg("medium") - .arg("medium") - .arg("FreeTTS"); + .tqarg(m_languageCode) + .tqarg("fixed") + .tqarg("neutral") + .tqarg("medium") + .tqarg("medium") + .tqarg("FreeTTS"); } } - return TQString::null; + return TQString(); } // TQString FreeTTSConf::getLocation(const TQString &name) { @@ -216,7 +216,7 @@ void FreeTTSConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(m_waveFile); TQFile::remove(m_waveFile); - m_waveFile = TQString::null; + m_waveFile = TQString(); if (m_progressDlg) m_progressDlg->close(); } diff --git a/kttsd/plugins/freetts/freettsconf.h b/kttsd/plugins/freetts/freettsconf.h index cc39b59..62e2e7a 100644 --- a/kttsd/plugins/freetts/freettsconf.h +++ b/kttsd/plugins/freetts/freettsconf.h @@ -32,11 +32,12 @@ class TQStringList; class KProgressDialog; class FreeTTSConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - FreeTTSConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FreeTTSConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~FreeTTSConf(); @@ -65,7 +66,7 @@ class FreeTTSConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -83,7 +84,7 @@ class FreeTTSConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui index 1d95751..7952692 100644 --- a/kttsd/plugins/freetts/freettsconfigwidget.ui +++ b/kttsd/plugins/freetts/freettsconfigwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>FreeTTSConfWidget</class> <author>Gary Cramblitt <garycramblitt@comcast.net></author> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>FreeTTSConfWidget</cstring> </property> @@ -38,14 +38,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>16</height> </size> </property> </spacer> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>freettsConfigurationBox</cstring> </property> @@ -76,7 +76,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>voicesPathBox</cstring> </property> @@ -90,7 +90,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>freettsPathLabel</cstring> </property> @@ -108,7 +108,7 @@ <property name="textFormat"> <enum>AutoText</enum> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="buddy" stdset="0"> @@ -130,7 +130,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>selectVoiceBox</cstring> </property> @@ -146,9 +146,9 @@ </property> </hbox> </widget> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <hbox> <property name="name"> @@ -164,14 +164,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>410</width> <height>20</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>freettsTest</cstring> </property> @@ -191,7 +191,7 @@ <include location="global" impldecl="in declaration">kurlrequester.h</include> <include location="global" impldecl="in implementation">kurlrequester.h</include> </includes> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/plugins/freetts/freettsproc.cpp b/kttsd/plugins/freetts/freettsproc.cpp index 9c038af..c3de342 100644 --- a/kttsd/plugins/freetts/freettsproc.cpp +++ b/kttsd/plugins/freetts/freettsproc.cpp @@ -27,8 +27,8 @@ #include "freettsproc.h" /** Constructor */ -FreeTTSProc::FreeTTSProc( TQObject* parent, const char* name, const TQStringList& /*args*/) : - PlugInProc( parent, name ) { +FreeTTSProc::FreeTTSProc( TQObject* tqparent, const char* name, const TQStringList& /*args*/) : + PlugInProc( tqparent, name ) { kdDebug() << "Running: FreeTTSProc::FreeTTSProc" << endl; m_state = psIdle; m_waitingStop = false; @@ -61,7 +61,7 @@ bool FreeTTSProc::init(KConfig *config, const TQString &configGroup) { * If the plugin supports asynchronous operation, it should return immediately. */ void FreeTTSProc::sayText(const TQString &text) { - synth(text, TQString::null, m_freettsJarPath); + synth(text, TQString(), m_freettsJarPath); } /** @@ -80,7 +80,7 @@ void FreeTTSProc::synthText(const TQString& text, const TQString& suggestedFilen } // A little helper function because KDE 3.2 kdDebug() does not support TQValueList<TQCString>. -TQStringList argsToQStringList(const TQValueList<TQCString> list) +TQStringList argsToTQStringList(const TQValueList<TQCString> list) { TQStringList newList; TQValueList<TQCString>::ConstIterator it = list.begin(); @@ -143,7 +143,7 @@ void FreeTTSProc::synth( if (!m_freettsProc->start(KProcess::NotifyOnExit, KProcess::All)) { kdDebug() << "FreeTTSProc::synth: Error starting FreeTTS process. Is freetts.jar in the PATH?" << endl; m_state = psIdle; - kdDebug() << "KProcess args: " << argsToQStringList(m_freettsProc->args()) << endl; + kdDebug() << "KProcess args: " << argsToTQStringList(m_freettsProc->args()) << endl; return; } kdDebug()<< "FreeTTSProc:synth: FreeTTS initialized" << endl; @@ -206,12 +206,12 @@ void FreeTTSProc::slotProcessExited(KProcess*) { } void FreeTTSProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); kdDebug() << "FreeTTSProc::slotReceivedStdout: Received output from FreeTTS: " << buf << endl; } void FreeTTSProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) { - TQString buf = TQString::fromLatin1(buffer, buflen); + TQString buf = TQString::tqfromLatin1(buffer, buflen); kdDebug() << "FreeTTSProc::slotReceivedStderr: Received error from FreeTTS: " << buf << endl; } @@ -242,7 +242,7 @@ pluginState FreeTTSProc::getState() { void FreeTTSProc::ackFinished() { if (m_state == psFinished) { m_state = psIdle; - m_synthFilename = TQString::null; + m_synthFilename = TQString(); } } diff --git a/kttsd/plugins/freetts/freettsproc.h b/kttsd/plugins/freetts/freettsproc.h index 7dbc3b5..15ad5f5 100644 --- a/kttsd/plugins/freetts/freettsproc.h +++ b/kttsd/plugins/freetts/freettsproc.h @@ -27,13 +27,14 @@ class KProcess; class FreeTTSProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** * Constructor */ - FreeTTSProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + FreeTTSProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** * Destructor diff --git a/kttsd/plugins/hadifix/SSMLtoTxt2pho.xsl b/kttsd/plugins/hadifix/SSMLtoTxt2pho.xsl index 5a81c8f..afa9b43 100644 --- a/kttsd/plugins/hadifix/SSMLtoTxt2pho.xsl +++ b/kttsd/plugins/hadifix/SSMLtoTxt2pho.xsl @@ -113,7 +113,7 @@ </xsl:variable> <!-- Look for first period and space and extract corresponding substring from original. --> <xsl:choose> - <xsl:when test="contains($tmp, '. ')"> + <xsl:when test="tqcontains($tmp, '. ')"> <xsl:value-of select="substring($paragraph, 1, string-length(substring-before($tmp, '. '))+2)"/> </xsl:when> <xsl:otherwise> diff --git a/kttsd/plugins/hadifix/hadifixconf.cpp b/kttsd/plugins/hadifix/hadifixconf.cpp index 0249aea..1d4a2cc 100644 --- a/kttsd/plugins/hadifix/hadifixconf.cpp +++ b/kttsd/plugins/hadifix/hadifixconf.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -// Qt includes. +// TQt includes. #include <tqlayout.h> #include <tqlabel.h> #include <tqgroupbox.h> @@ -92,15 +92,15 @@ class HadifixConfPrivate { TQString name = TQFileInfo(*it).fileName(); gender = HadifixProc::determineGender(defaultMbrolaExec, *it); if (gender == HadifixProc::MaleGender) - configWidget->addVoice(*it, true, i18n("Male voice \"%1\"").arg(name)); + configWidget->addVoice(*it, true, i18n("Male voice \"%1\"").tqarg(name)); else if (gender == HadifixProc::FemaleGender) - configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name)); + configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name)); else { if (name == "de1") - configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").arg(name)); + configWidget->addVoice(*it, false, i18n("Female voice \"%1\"").tqarg(name)); else { - configWidget->addVoice(*it, true, i18n("Unknown voice \"%1\"").arg(name)); - configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").arg(name)); + configWidget->addVoice(*it, true, i18n("Unknown voice \"%1\"").tqarg(name)); + configWidget->addVoice(*it, false, i18n("Unknown voice \"%1\"").tqarg(name)); } } } @@ -203,11 +203,11 @@ class HadifixConfPrivate { }; /** Constructor */ -HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList &) : - PlugInConf( parent, name ){ +HadifixConf::HadifixConf( TQWidget* tqparent, const char* name, const TQStringList &) : + PlugInConf( tqparent, name ){ // kdDebug() << "HadifixConf::HadifixConf: Running" << endl; - TQVBoxLayout *layout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout"); - layout->setAlignment (Qt::AlignTop); + TQVBoxLayout *tqlayout = new TQVBoxLayout (this, KDialog::marginHint(), KDialog::spacingHint(), "CommandConfigWidgetLayout"); + tqlayout->tqsetAlignment (TQt::AlignTop); d = new HadifixConfPrivate(); d->configWidget = new HadifixConfigUI (this, "configWidget"); @@ -224,7 +224,7 @@ HadifixConf::HadifixConf( TQWidget* parent, const char* name, const TQStringList d->initializeCharacterCodes(); d->initializeVoices(); d->setDefaults(); - layout->addWidget (d->configWidget); + tqlayout->addWidget (d->configWidget); } /** Destructor */ @@ -284,15 +284,15 @@ TQString HadifixConf::getTalkerCode() "<voice lang=\"%1\" name=\"%2\" gender=\"%3\" />" "<prosody volume=\"%4\" rate=\"%5\" />" "<kttsd synthesizer=\"%6\" />") - .arg(d->languageCode) - .arg(voiceCode) - .arg(gender) - .arg(volume) - .arg(rate) - .arg("Hadifix"); + .tqarg(d->languageCode) + .tqarg(voiceCode) + .tqarg(gender) + .tqarg(volume) + .tqarg(rate) + .tqarg("Hadifix"); } } - return TQString::null; + return TQString(); } void HadifixConf::voiceButton_clicked () { @@ -393,7 +393,7 @@ void HadifixConf::slotSynthFinished() // Player object deletes the wave file when done. if (m_player) m_player->play(d->waveFile); TQFile::remove(d->waveFile); - d->waveFile = TQString::null; + d->waveFile = TQString(); if (d->progressDlg) d->progressDlg->close(); } diff --git a/kttsd/plugins/hadifix/hadifixconf.h b/kttsd/plugins/hadifix/hadifixconf.h index 4ef96a6..7eb7b30 100644 --- a/kttsd/plugins/hadifix/hadifixconf.h +++ b/kttsd/plugins/hadifix/hadifixconf.h @@ -11,11 +11,12 @@ class HadifixProc; class HadifixConfPrivate; class HadifixConf : public PlugInConf { - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: /** Constructor */ - HadifixConf( TQWidget* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + HadifixConf( TQWidget* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~HadifixConf(); @@ -44,7 +45,7 @@ class HadifixConf : public PlugInConf { * This function informs the plugin of the desired language to be spoken * by the plugin. The plugin should attempt to adapt itself to the * specified language code, choosing sensible defaults if necessary. - * If the passed-in code is TQString::null, no specific language has + * If the passed-in code is TQString(), no specific language has * been chosen. * @param lang The desired language code or Null if none. * @@ -62,7 +63,7 @@ class HadifixConf : public PlugInConf { * Return fully-specified talker code for the configured plugin. This code * uniquely identifies the configured instance of the plugin and distinquishes * one instance from another. If the plugin has not been fully configured, - * i.e., cannot yet synthesize, return TQString::null. + * i.e., cannot yet synthesize, return TQString(). * @return Fully-specified talker code. */ TQString getTalkerCode(); diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui index 302c1de..8a61bff 100644 --- a/kttsd/plugins/hadifix/hadifixconfigui.ui +++ b/kttsd/plugins/hadifix/hadifixconfigui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>HadifixConfigUI</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>HadifixConfigUI</cstring> </property> @@ -28,7 +28,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="0" column="0"> + <widget class="TQGroupBox" row="0" column="0"> <property name="name"> <cstring>GroupBox4</cstring> </property> @@ -56,7 +56,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>basicOptions</cstring> </property> @@ -81,7 +81,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>voiceLabel</cstring> </property> @@ -135,7 +135,7 @@ <string>&Select...</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>volumeLabel</cstring> </property> @@ -188,7 +188,7 @@ <string>Adjusts the volume of speech. Slide to left for softer speech; to the right for louder.</string> </property> </widget> - <widget class="QSlider" row="1" column="2" rowspan="1" colspan="2"> + <widget class="TQSlider" row="1" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>volumeSlider</cstring> </property> @@ -223,7 +223,7 @@ <string>Adjusts the volume of speech. Slide to left for softer speech; to the right for louder.</string> </property> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>timeLabel</cstring> </property> @@ -276,7 +276,7 @@ <string>Adjusts the speed of speech. Slide to left for slower speech; to the right for faster.</string> </property> </widget> - <widget class="QSlider" row="2" column="2" rowspan="1" colspan="2"> + <widget class="TQSlider" row="2" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>timeSlider</cstring> </property> @@ -305,7 +305,7 @@ <string>Adjusts the speed of speech. Slide to left for slower speech; to the right for faster.</string> </property> </widget> - <widget class="QLabel" row="3" column="0"> + <widget class="TQLabel" row="3" column="0"> <property name="name"> <cstring>frequencyLabel</cstring> </property> @@ -355,7 +355,7 @@ <string>Adjusts the pitch (tone) of speech. Slide to left for lower speech; to the right for higher.</string> </property> </widget> - <widget class="QSlider" row="3" column="2" rowspan="1" colspan="2"> + <widget class="TQSlider" row="3" column="2" rowspan="1" colspan="2"> <property name="name"> <cstring>frequencySlider</cstring> </property> @@ -383,7 +383,7 @@ </widget> </grid> </widget> - <widget class="QGroupBox" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQGroupBox" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>advancedOptions</cstring> </property> @@ -408,7 +408,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>hadifixBinLabel</cstring> </property> @@ -438,7 +438,7 @@ <string>If the txt2pho program is in your PATH environment variable, simply enter "txt2pho", otherwise specify the full path to the txt2pho executable program.</string> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>mbrolaBinLabel</cstring> </property> @@ -468,15 +468,15 @@ <string>If the Mbrola program is in your PATH environment variable, simply enter "mbrola", otherwise specify the full path to the Mbrola executable program.</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>characterCodingLabel</cstring> </property> @@ -525,7 +525,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>240</width> <height>20</height> @@ -596,84 +596,84 @@ </connection> <connection> <sender>voiceCombo</sender> - <signal>activated(const QString&)</signal> + <signal>activated(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> <connection> <sender>volumeBox</sender> - <signal>valueChanged(const QString&)</signal> + <signal>valueChanged(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> <connection> <sender>timeBox</sender> - <signal>valueChanged(const QString&)</signal> + <signal>valueChanged(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> <connection> <sender>frequencyBox</sender> - <signal>valueChanged(const QString&)</signal> + <signal>valueChanged(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> <connection> <sender>hadifixURL</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> <connection> <sender>mbrolaURL</sender> - <signal>textChanged(const QString&)</signal> + <signal>textChanged(const TQString&)</signal> <receiver>HadifixConfigUI</receiver> - <slot>changed(const QString&)</slot> + <slot>changed(const TQString&)</slot> </connection> </connections> <includes> - <include location="global" impldecl="in declaration">qradiobutton.h</include> - <include location="global" impldecl="in declaration">qpixmap.h</include> + <include location="global" impldecl="in declaration">tqradiobutton.h</include> + <include location="global" impldecl="in declaration">tqpixmap.h</include> <include location="global" impldecl="in declaration">kurl.h</include> - <include location="global" impldecl="in declaration">qmap.h</include> + <include location="global" impldecl="in declaration">tqmap.h</include> <include location="global" impldecl="in implementation">kglobal.h</include> - <include location="global" impldecl="in implementation">qstringlist.h</include> + <include location="global" impldecl="in implementation">tqstringlist.h</include> <include location="global" impldecl="in implementation">math.h</include> <include location="global" impldecl="in implementation">kiconloader.h</include> </includes> <forwards> - <forward>class QStringList;</forward> + <forward>class TQStringList;</forward> </forwards> <variables> - <variable>QMap<QString,int> maleVoices;</variable> - <variable>QMap<int,QString> defaultVoices;</variable> + <variable>TQMap<TQString,int> maleVoices;</variable> + <variable>TQMap<int,TQString> defaultVoices;</variable> <variable>QPixmap female;</variable> <variable>QPixmap male;</variable> - <variable>QMap<QString,int> femaleVoices;</variable> + <variable>TQMap<TQString,int> femaleVoices;</variable> </variables> -<signals> +<Q_SIGNALS> <signal>changed(bool)</signal> -</signals> -<slots> +</Q_SIGNALS> +<Q_SLOTS> <slot access="protected" specifier="non virtual">volumeBox_valueChanged( int percentValue )</slot> <slot access="protected" specifier="non virtual">timeBox_valueChanged( int percentValue )</slot> <slot access="protected" specifier="non virtual">frequencyBox_valueChanged( int percentValue )</slot> <slot access="protected" specifier="non virtual">volumeSlider_valueChanged( int sliderValue )</slot> <slot access="protected" specifier="non virtual">timeSlider_valueChanged( int sliderValue )</slot> <slot access="protected" specifier="non virtual">frequencySlider_valueChanged( int sliderValue )</slot> - <slot access="protected">changed( const QString & )</slot> -</slots> + <slot access="protected">changed( const TQString & )</slot> +</Q_SLOTS> <functions> <function access="protected" specifier="non virtual" returnType="int">percentToSlider( int percentValue )</function> <function access="protected" specifier="non virtual" returnType="int">sliderToPercent( int sliderValue )</function> <function access="private" specifier="non virtual">init()</function> - <function specifier="non virtual">addVoice( const QString &filename, bool isMale )</function> - <function specifier="non virtual">addVoice( const QString &filename, bool isMale, const QString &displayname )</function> - <function specifier="non virtual">setVoice( const QString &filename, bool isMale )</function> - <function specifier="non virtual" returnType="QString">getVoiceFilename()</function> + <function specifier="non virtual">addVoice( const TQString &filename, bool isMale )</function> + <function specifier="non virtual">addVoice( const TQString &filename, bool isMale, const TQString &displayname )</function> + <function specifier="non virtual">setVoice( const TQString &filename, bool isMale )</function> + <function specifier="non virtual" returnType="TQString">getVoiceFilename()</function> <function specifier="non virtual" returnType="bool">isMaleVoice()</function> </functions> -<layoutdefaults spacing="6" margin="11"/> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kcombobox.h</includehint> <includehint>kpushbutton.h</includehint> diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui.h b/kttsd/plugins/hadifix/hadifixconfigui.ui.h index 7c21c54..cc6632c 100644 --- a/kttsd/plugins/hadifix/hadifixconfigui.ui.h +++ b/kttsd/plugins/hadifix/hadifixconfigui.ui.h @@ -1,7 +1,7 @@ /**************************************************************************** ** ui.h extension file, included from the uic-generated form implementation. ** -** If you wish to add, delete or rename slots use Qt Designer which will +** If you wish to add, delete or rename slots use TQt Designer which will ** update this file, preserving your code. Create an init() slot in place of ** a constructor, and a destroy() slot in place of a destructor. *****************************************************************************/ @@ -53,14 +53,14 @@ void HadifixConfigUI::init () { void HadifixConfigUI::addVoice (const TQString &filename, bool isMale) { if (isMale) { - if (!maleVoices.contains(filename)) { + if (!maleVoices.tqcontains(filename)) { int id = voiceCombo->count(); maleVoices.insert (filename, id); voiceCombo->insertItem (male, filename, id); } } else { - if (!femaleVoices.contains(filename)) { + if (!femaleVoices.tqcontains(filename)) { int id = voiceCombo->count(); femaleVoices.insert (filename, id); voiceCombo->insertItem (female, filename, id); @@ -93,7 +93,7 @@ TQString HadifixConfigUI::getVoiceFilename() { int curr = voiceCombo->currentItem(); TQString filename = voiceCombo->text(curr); - if (defaultVoices.contains(curr)) + if (defaultVoices.tqcontains(curr)) filename = defaultVoices[curr]; return filename; @@ -103,7 +103,7 @@ bool HadifixConfigUI::isMaleVoice() { int curr = voiceCombo->currentItem(); TQString filename = getVoiceFilename(); - if (maleVoices.contains(filename)) + if (maleVoices.tqcontains(filename)) return maleVoices[filename] == curr; else return false; diff --git a/kttsd/plugins/hadifix/hadifixproc.cpp b/kttsd/plugins/hadifix/hadifixproc.cpp index 598eb21..3e4b4ee 100644 --- a/kttsd/plugins/hadifix/hadifixproc.cpp +++ b/kttsd/plugins/hadifix/hadifixproc.cpp @@ -35,7 +35,7 @@ class HadifixProcPrivate { hadifixProc = 0; waitingStop = false; state = psIdle; - synthFilename = TQString::null; + synthFilename = TQString(); gender = false; volume = 100; time = 100; @@ -49,9 +49,9 @@ class HadifixProcPrivate { void load(KConfig *config, const TQString &configGroup) { config->setGroup(configGroup); - hadifix = config->readEntry ("hadifixExec", TQString::null); - mbrola = config->readEntry ("mbrolaExec", TQString::null); - voice = config->readEntry ("voice", TQString::null); + hadifix = config->readEntry ("hadifixExec", TQString()); + mbrola = config->readEntry ("mbrolaExec", TQString()); + voice = config->readEntry ("voice", TQString()); gender = config->readBoolEntry("gender", false); volume = config->readNumEntry ("volume", 100); time = config->readNumEntry ("time", 100); @@ -75,8 +75,8 @@ class HadifixProcPrivate { }; /** Constructor */ -HadifixProc::HadifixProc( TQObject* parent, const char* name, const TQStringList &) : - PlugInProc( parent, name ){ +HadifixProc::HadifixProc( TQObject* tqparent, const char* name, const TQStringList &) : + PlugInProc( tqparent, name ){ // kdDebug() << "HadifixProc::HadifixProc: Running" << endl; d = 0; } @@ -184,9 +184,9 @@ void HadifixProc::synth(TQString text, TQString mbrolaCommand = d->hadifixProc->quote(mbrola); mbrolaCommand += " -e"; //Ignore fatal errors on unkown diphone - mbrolaCommand += TQString(" -v %1").arg(volume/100.0); // volume ratio - mbrolaCommand += TQString(" -f %1").arg(pitch/100.0); // freqency ratio - mbrolaCommand += TQString(" -t %1").arg(1/(time/100.0)); // time ratio + mbrolaCommand += TQString(" -v %1").tqarg(volume/100.0); // volume ratio + mbrolaCommand += TQString(" -f %1").tqarg(pitch/100.0); // freqency ratio + mbrolaCommand += TQString(" -t %1").tqarg(1/(time/100.0)); // time ratio mbrolaCommand += " " + d->hadifixProc->quote(voice); mbrolaCommand += " - " + d->hadifixProc->quote(waveFilename); @@ -285,7 +285,7 @@ void HadifixProc::ackFinished() if (d->state == psFinished) { d->state = psIdle; - d->synthFilename = TQString::null; + d->synthFilename = TQString(); } } @@ -364,8 +364,8 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString connect(&proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), &speech, TQT_SLOT(receivedStderr(KProcess *, char *, int))); - speech.stdOut = TQString::null; - speech.stdErr = TQString::null; + speech.stdOut = TQString(); + speech.stdErr = TQString(); proc.start (KProcess::Block, KProcess::AllOutput); VoiceGender result; @@ -377,9 +377,9 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString else { if (output != 0) *output = speech.stdOut; - if (speech.stdOut.contains("female", false)) + if (speech.stdOut.tqcontains("female", false)) result = FemaleGender; - else if (speech.stdOut.contains("male", false)) + else if (speech.stdOut.tqcontains("male", false)) result = MaleGender; else result = NoGender; @@ -389,11 +389,11 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString } void HadifixProc::receivedStdout (KProcess *, char *buffer, int buflen) { - stdOut += TQString::fromLatin1(buffer, buflen); + stdOut += TQString::tqfromLatin1(buffer, buflen); } void HadifixProc::receivedStderr (KProcess *, char *buffer, int buflen) { - stdErr += TQString::fromLatin1(buffer, buflen); + stdErr += TQString::tqfromLatin1(buffer, buflen); } /** diff --git a/kttsd/plugins/hadifix/hadifixproc.h b/kttsd/plugins/hadifix/hadifixproc.h index 01b7c5d..4fbf03b 100644 --- a/kttsd/plugins/hadifix/hadifixproc.h +++ b/kttsd/plugins/hadifix/hadifixproc.h @@ -26,7 +26,8 @@ class KProcess; class HadifixProcPrivate; class HadifixProc : public PlugInProc{ - Q_OBJECT + Q_OBJECT + TQ_OBJECT public: enum VoiceGender { @@ -37,7 +38,7 @@ class HadifixProc : public PlugInProc{ }; /** Constructor */ - HadifixProc( TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + HadifixProc( TQObject* tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList()); /** Destructor */ ~HadifixProc(); diff --git a/kttsd/plugins/hadifix/initialconfig.h b/kttsd/plugins/hadifix/initialconfig.h index 02e920c..62ff659 100644 --- a/kttsd/plugins/hadifix/initialconfig.h +++ b/kttsd/plugins/hadifix/initialconfig.h @@ -71,7 +71,7 @@ TQString findExecutable (const TQStringList &names, const TQString &possiblePath } // Both tries failed, so the user has to locate the executable. - return TQString::null; + return TQString(); } /** Tries to find the voice files by looking onto the hard disk. */ @@ -100,7 +100,7 @@ TQStringList findVoices(TQString mbrolaExec, const TQString &hadifixDataPath) { // 2b) search near the hadifix data path info.setFile(hadifixDataPath + "../../mbrola"); TQString mbrolaPath = info.dirPath (true) + "/mbrola"; - if (!list.contains(mbrolaPath)) + if (!list.tqcontains(mbrolaPath)) list += mbrolaPath; // 2c) broaden the search by adding subdirs (with a depth of 2) @@ -114,7 +114,7 @@ TQStringList findVoices(TQString mbrolaExec, const TQString &hadifixDataPath) { TQStringList result; TQStringList::iterator it; for (it = list.begin(); it != list.end(); ++it) { - TQDir baseDir (*it, TQString::null, + TQDir baseDir (*it, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Files); TQStringList files = baseDir.entryList(); @@ -148,7 +148,7 @@ TQStringList findSubdirs (const TQStringList &baseDirs) { TQStringList::ConstIterator itEnd = baseDirs.constEnd(); for (it = baseDirs.constBegin(); it != itEnd; ++it) { // a) get a list of directory names - TQDir baseDir (*it, TQString::null, + TQDir baseDir (*it, TQString(), TQDir::Name|TQDir::IgnoreCase, TQDir::Dirs); TQStringList list = baseDir.entryList(); diff --git a/kttsd/plugins/hadifix/voicefileui.ui b/kttsd/plugins/hadifix/voicefileui.ui index 6c038f7..3c9a5fa 100644 --- a/kttsd/plugins/hadifix/voicefileui.ui +++ b/kttsd/plugins/hadifix/voicefileui.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.1" stdsetdef="1"> <class>VoiceFileWidget</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>VoiceFileWidget</cstring> </property> @@ -25,7 +25,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>voiceFileLabel</cstring> </property> @@ -44,7 +44,7 @@ <enum>Plain</enum> </property> </widget> - <widget class="QButtonGroup" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>genderOption</cstring> </property> @@ -61,7 +61,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0"> + <widget class="TQRadioButton" row="0" column="0"> <property name="name"> <cstring>femaleOption</cstring> </property> @@ -69,7 +69,7 @@ <string>Female</string> </property> </widget> - <widget class="QRadioButton" row="0" column="1"> + <widget class="TQRadioButton" row="0" column="1"> <property name="name"> <cstring>maleOption</cstring> </property> @@ -106,10 +106,10 @@ <variables> <variable access="public">QString mbrola;</variable> </variables> -<slots> +<Q_SLOTS> <slot>genderButton_clicked()</slot> -</slots> -<layoutdefaults spacing="6" margin="11"/> +</Q_SLOTS> +<tqlayoutdefaults spacing="6" margin="11"/> <includehints> <includehint>kurlrequester.h</includehint> <includehint>klineedit.h</includehint> diff --git a/kttsd/plugins/hadifix/voicefileui.ui.h b/kttsd/plugins/hadifix/voicefileui.ui.h index 16e65e5..dfd177d 100644 --- a/kttsd/plugins/hadifix/voicefileui.ui.h +++ b/kttsd/plugins/hadifix/voicefileui.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -24,12 +24,12 @@ void VoiceFileWidget::genderButton_clicked() } else if (gender == HadifixProc::NoGender) { KMessageBox::sorry (this, - i18n("The gender of the voice file %1 could not be detected.").arg(voiceFileURL->url()), + i18n("The gender of the voice file %1 could not be detected.").tqarg(voiceFileURL->url()), i18n("Trying to Determine the Gender - Hadifix Plug In")); } else { KMessageBox::detailedSorry (this, - i18n("The file %1 does not seem to be a voice file.").arg(voiceFileURL->url()), + i18n("The file %1 does not seem to be a voice file.").tqarg(voiceFileURL->url()), details, i18n("Trying to Determine the Gender - Hadifix Plug In")); } } |