From f46912a1a50c5ca06eb713e43e170f5ac47bb680 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:10 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 23aecb275d6085b7a15a38da0180edf156c8ea9d. --- kbstateapplet/kbstate.cpp | 26 +++++----- kbstateapplet/kbstate.h | 4 +- kmag/kmag.cpp | 18 +++---- kmag/kmag.h | 2 +- kmag/kmagselrect.cpp | 16 +++--- kmag/kmagzoomview.cpp | 50 +++++++++---------- kmag/kmagzoomview.h | 2 +- kmousetool/kmousetool/kmousetool.cpp | 2 +- kmousetool/kmousetool/kmousetoolui.ui | 20 ++++---- kmouth/configwizard.cpp | 2 +- kmouth/kmouth.h | 2 +- kmouth/optionsdialog.cpp | 6 +-- kmouth/phrasebook/phrasebook.cpp | 22 ++++---- kmouth/phrasebook/phrasebook.h | 2 +- kmouth/phrasebook/phrasebookdialog.cpp | 16 +++--- kmouth/phrasebook/phrasetree.cpp | 6 +-- kmouth/phraselist.cpp | 16 +++--- kmouth/phraselistitem.cpp | 2 +- kmouth/speech.cpp | 6 +-- kmouth/texttospeechconfigurationwidget.cpp | 4 +- kmouth/texttospeechsystem.cpp | 2 +- kmouth/wordcompletion/creationsourcedetailsui.ui.h | 4 +- kmouth/wordcompletion/creationsourceui.ui | 2 +- kmouth/wordcompletion/dictionarycreationwizard.cpp | 16 +++--- kmouth/wordcompletion/klanguagebutton.cpp | 10 ++-- kmouth/wordcompletion/klanguagebuttonhelper.cpp | 14 +++--- kmouth/wordcompletion/wordcompletionui.ui | 6 +-- kmouth/wordcompletion/wordcompletionui.ui.h | 4 +- kmouth/wordcompletion/wordcompletionwidget.cpp | 18 +++---- kmouth/wordcompletion/wordlist.cpp | 16 +++--- ksayit/Freeverb_plugin/freeverb_setup.ui | 30 +++++------ ksayit/Freeverb_plugin/ksayitfreeverblib.cpp | 2 +- ksayit/KTTSD_Lib/KTTSDlibSetup.ui | 6 +-- ksayit/KTTSD_Lib/kttsdlib.cpp | 2 +- ksayit/KTTSD_Lib/kttsdlib.h | 2 +- ksayit/src/DocTreeView.ui | 2 +- ksayit/src/KSayItView.ui | 2 +- ksayit/src/docbookclasses.cpp | 2 +- ksayit/src/docbookgenerator.h | 2 +- ksayit/src/docbookparser.cpp | 34 ++++++------- ksayit/src/doctreeviewimpl.cpp | 42 ++++++++-------- ksayit/src/fx_setup.ui | 24 ++++----- ksayit/src/ksayit.cpp | 10 ++-- ksayit/src/ksayit.h | 4 +- ksayit/src/ksayitviewimpl.cpp | 2 +- ksayit/src/ksayitviewimpl.h | 2 +- ksayit/src/saxhandler.cpp | 4 +- ksayit/src/voicesetupdlg.cpp | 8 +-- kttsd/debian/man/kttsd.1 | 6 +-- kttsd/debian/man/kttsmgr.1 | 6 +-- kttsd/filters/main.cpp | 2 +- kttsd/filters/sbd/sbdconf.cpp | 8 +-- kttsd/filters/sbd/sbdconfwidget.ui | 24 ++++----- kttsd/filters/sbd/sbdproc.cpp | 4 +- kttsd/filters/sbd/sbdproc.h | 2 +- .../stringreplacer/editreplacementwidget.ui | 16 +++--- .../filters/stringreplacer/stringreplacerconf.cpp | 8 +-- .../stringreplacer/stringreplacerconfwidget.ui | 22 ++++---- kttsd/filters/stringreplacer/stringreplacerproc.h | 2 +- kttsd/filters/talkerchooser/talkerchooserconf.cpp | 8 +-- .../talkerchooser/talkerchooserconfwidget.ui | 18 +++---- .../filters/xmltransformer/xmltransformerconf.cpp | 8 +-- .../xmltransformer/xmltransformerconfwidget.ui | 20 ++++---- .../filters/xmltransformer/xmltransformerproc.cpp | 4 +- kttsd/kcmkttsmgr/addtalkerwidget.ui | 16 +++--- kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 16 +++--- kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui | 58 +++++++++++----------- kttsd/kcmkttsmgr/selectevent.cpp | 16 +++--- kttsd/kttsd/filtermgr.cpp | 2 +- kttsd/kttsd/kttsd.cpp | 8 +-- kttsd/kttsd/speaker.cpp | 4 +- kttsd/kttsd/ssmlconvert.cpp | 2 +- kttsd/kttsd/talkermgr.cpp | 4 +- kttsd/kttsjobmgr/kttsjobmgr.cpp | 12 ++--- kttsd/kttsmgr/kttsmgr.cpp | 8 +-- kttsd/kttsmgr/kttsmgr.h | 2 +- kttsd/libkttsd/notify.cpp | 10 ++-- kttsd/libkttsd/pluginproc.cpp | 2 +- kttsd/libkttsd/selecttalkerwidget.ui | 20 ++++---- kttsd/libkttsd/stretcher.cpp | 2 +- kttsd/libkttsd/talkercode.cpp | 2 +- kttsd/libkttsd/testplayer.cpp | 2 +- kttsd/players/alsaplayer/alsaplayer.cpp | 6 +-- kttsd/players/gstplayer/gstreamerplayer.cpp | 6 +-- kttsd/plugins/command/commandconf.cpp | 22 ++++---- kttsd/plugins/command/commandconfwidget.ui | 8 +-- kttsd/plugins/command/commandproc.cpp | 6 +-- kttsd/plugins/epos/eposconf.cpp | 22 ++++---- kttsd/plugins/epos/eposconfwidget.ui | 34 ++++++------- kttsd/plugins/epos/eposproc.cpp | 12 ++--- kttsd/plugins/festivalint/festivalintconf.cpp | 22 ++++---- kttsd/plugins/festivalint/festivalintconfwidget.ui | 18 +++---- kttsd/plugins/festivalint/festivalintproc.cpp | 12 ++--- kttsd/plugins/flite/fliteconf.cpp | 20 ++++---- kttsd/plugins/flite/fliteconfwidget.ui | 6 +-- kttsd/plugins/flite/fliteproc.cpp | 4 +- kttsd/plugins/freetts/freettsconf.cpp | 20 ++++---- kttsd/plugins/freetts/freettsconfigwidget.ui | 8 +-- kttsd/plugins/freetts/freettsproc.cpp | 4 +- kttsd/plugins/hadifix/hadifixconf.cpp | 30 +++++------ kttsd/plugins/hadifix/hadifixconfigui.ui | 4 +- kttsd/plugins/hadifix/hadifixproc.cpp | 12 ++--- kttsd/plugins/hadifix/voicefileui.ui.h | 4 +- 103 files changed, 560 insertions(+), 560 deletions(-) diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 4afc15d..0966f58 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -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 @@ -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; @@ -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(); @@ -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(); @@ -1068,12 +1068,12 @@ void TimeoutIcon::drawButton (TQPainter *p) { StatusIcon::StatusIcon (const TQString &text, TQWidget *parent, const char *name) : TQPushButton (text, parent, name) { - setSizePolicy(TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored)); + 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 65cf63f..fc6987f 100644 --- a/kbstateapplet/kbstate.h +++ b/kbstateapplet/kbstate.h @@ -40,7 +40,7 @@ public: StatusIcon (const TQString &text, TQWidget *parent, const char *name=0); ~StatusIcon (); - TQSize minimumSizeHint () const; + TQSize tqminimumSizeHint () const; }; typedef TQPtrList IconList; @@ -170,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 41807f1..5827468 100644 --- a/kmag/kmag.cpp +++ b/kmag/kmag.cpp @@ -21,8 +21,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -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 ); @@ -550,7 +550,7 @@ void KmagApp::saveZoomPixmap() bool toggled(false); // stop refresh temporarily - if (m_zoomView->getRefreshStatus()) { + if (m_zoomView->getRefreshtqStatus()) { slotToggleRefresh(); toggled = true; } @@ -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")); @@ -810,7 +810,7 @@ void KmagApp::slotFilePrint() #endif // stop refresh temporarily - if (m_zoomView->getRefreshStatus()) { + if (m_zoomView->getRefreshtqStatus()) { slotToggleRefresh(); toggled = true; } @@ -864,7 +864,7 @@ void KmagApp::slotFileQuit() void KmagApp::copyToClipBoard() { - TQClipboard *cb=KApplication::clipboard(); + TQClipboard *cb=KApplication::tqclipboard(); cb->setPixmap(m_zoomView->getPixmap()); } diff --git a/kmag/kmag.h b/kmag/kmag.h index 445d51e..aeee22b 100644 --- a/kmag/kmag.h +++ b/kmag/kmag.h @@ -71,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 73caf5a..236bddf 100644 --- a/kmag/kmagselrect.cpp +++ b/kmag/kmagselrect.cpp @@ -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())); diff --git a/kmag/kmagzoomview.cpp b/kmag/kmagzoomview.cpp index 47f6a46..f0f3715 100644 --- a/kmag/kmagzoomview.cpp +++ b/kmag/kmagzoomview.cpp @@ -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, parent, *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, &parent, &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; @@ -255,7 +255,7 @@ 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(), TQt::ThresholdDither | TQt::ThresholdAlphaDither | TQt::AvoidDither); } else { @@ -493,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 @@ -504,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 @@ -516,7 +516,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); } break; @@ -706,7 +706,7 @@ void KMagZoomView::fitToWindow() m_selRect.moveCenter(currCenter); m_selRect.update(); - viewport()->repaint(false); + viewport()->tqrepaint(false); } void KMagZoomView::setFitToWindow(bool fit) @@ -751,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 rects (intersection.rects()); + TQMemArray 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); } @@ -775,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); } /** @@ -801,7 +801,7 @@ void KMagZoomView::setZoom(float zoom) { m_zoom = zoom; updateMatrix(); - viewport()->repaint(); + viewport()->tqrepaint(); } /** @@ -811,7 +811,7 @@ void KMagZoomView::setRotation(int rotation) { m_rotation = rotation; updateMatrix(); - viewport()->repaint(); + viewport()->tqrepaint(); } /** @@ -820,7 +820,7 @@ void KMagZoomView::setRotation(int rotation) void KMagZoomView::setInvertation(bool invert) { m_invert = invert; - viewport()->repaint(); + viewport()->tqrepaint(); } /** diff --git a/kmag/kmagzoomview.h b/kmag/kmagzoomview.h index 89882b4..1f8d9bc 100644 --- a/kmag/kmagzoomview.h +++ b/kmag/kmagzoomview.h @@ -61,7 +61,7 @@ class KMagZoomView : public TQScrollView 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; }; diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp index e269caf..3df4b68 100644 --- a/kmousetool/kmousetool/kmousetool.cpp +++ b/kmousetool/kmousetool/kmousetool.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kmousetool/kmousetool/kmousetoolui.ui b/kmousetool/kmousetool/kmousetoolui.ui index 2d7d9fb..d5e22fa 100644 --- a/kmousetool/kmousetool/kmousetoolui.ui +++ b/kmousetool/kmousetool/kmousetoolui.ui @@ -29,7 +29,7 @@ Expanding - + 20 30 @@ -49,7 +49,7 @@ - layout9 + tqlayout9 @@ -65,7 +65,7 @@ Fixed - + 16 20 @@ -207,7 +207,7 @@ - layout5 + tqlayout5 @@ -239,7 +239,7 @@ Expanding - + 31 20 @@ -276,7 +276,7 @@ - layout5 + tqlayout5 @@ -300,7 +300,7 @@ false - + WordBreak|AlignJustify|AlignVCenter @@ -314,7 +314,7 @@ Fixed - + 8 8 @@ -341,7 +341,7 @@ - layout5 + tqlayout5 @@ -365,7 +365,7 @@ Expanding - + 241 20 diff --git a/kmouth/configwizard.cpp b/kmouth/configwizard.cpp index 1fc70a0..3ca0b5c 100644 --- a/kmouth/configwizard.cpp +++ b/kmouth/configwizard.cpp @@ -17,7 +17,7 @@ #include "configwizard.h" -#include +#include #include #include #include diff --git a/kmouth/kmouth.h b/kmouth/kmouth.h index b8d791d..fe610a6 100644 --- a/kmouth/kmouth.h +++ b/kmouth/kmouth.h @@ -79,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 89842a3..a32eb6e 100644 --- a/kmouth/optionsdialog.cpp +++ b/kmouth/optionsdialog.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ -#include +#include #include #include #include @@ -125,11 +125,11 @@ OptionsDialog::OptionsDialog (TQWidget *parent) 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); diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp index ffa3ff2..2332ee6 100644 --- a/kmouth/phrasebook/phrasebook.cpp +++ b/kmouth/phrasebook/phrasebook.cpp @@ -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 + ";"; @@ -274,8 +274,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p } if (KIO::NetAccess::exists(url)) { - if (KMessageBox::warningContinueCancel(0,TQString("%1").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("%1").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; } } @@ -286,8 +286,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p url.setFileName (url.fileName(false) + ".phrasebook"); } else if (url.fileName (false).right (11).contains (".phrasebook", false) == 0) { - int filetype = KMessageBox::questionYesNoCancel (0,TQString("%1").arg(i18n("Your chosen filename %1 has a different extension than .phrasebook. " - "Do you wish to add .phrasebook to the filename?").arg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add")); + int filetype = KMessageBox::questionYesNoCancel (0,TQString("%1").tqarg(i18n("Your chosen filename %1 has a different extension than .phrasebook. " + "Do you wish to add .phrasebook to the filename?").tqarg(url.filename())),i18n("File Extension"),i18n("Add"),i18n("Do Not Add")); if (filetype == KMessageBox::Cancel) { return 0; } @@ -302,8 +302,8 @@ int PhraseBook::save (TQWidget *parent, const TQString &title, KURL &url, bool p result = save (url, false); } else { - int filetype = KMessageBox::questionYesNoCancel (0,TQString("%1").arg(i18n("Your chosen filename %1 has the extension .phrasebook. " - "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("%1").tqarg(i18n("Your chosen filename %1 has the extension .phrasebook. " + "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; } @@ -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); + return xmlphrasebook.tqencodedData(mime); else if (m.contains("xml")) - return xml.encodedData(mime); + 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 25f1d37..200bbae 100644 --- a/kmouth/phrasebook/phrasebook.h +++ b/kmouth/phrasebook/phrasebook.h @@ -157,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); diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp index 50a5b05..3cfe25b 100644 --- a/kmouth/phrasebook/phrasebookdialog.cpp +++ b/kmouth/phrasebook/phrasebookdialog.cpp @@ -17,8 +17,8 @@ // include files for QT #include -#include -#include +#include +#include #include #include #include @@ -132,7 +132,7 @@ void CheckBookItem::childChange (int numberDiff, int selDiff) { ((CheckBookItem*)parent)->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); } @@ -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; } @@ -667,12 +667,12 @@ 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); } } @@ -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/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp index 27735c5..e4adde1 100644 --- a/kmouth/phrasebook/phrasetree.cpp +++ b/kmouth/phrasebook/phrasetree.cpp @@ -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/phraselist.cpp b/kmouth/phraselist.cpp index 08fc6b9..3cbd9d4 100644 --- a/kmouth/phraselist.cpp +++ b/kmouth/phraselist.cpp @@ -18,10 +18,10 @@ // include files for TQt #include #include -#include +#include #include #include -#include +#include // include files for KDE #include @@ -48,16 +48,16 @@ PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,name) { isInSlot = false; setBackgroundMode(PaletteBase); - TQVBoxLayout *layout = new TQVBoxLayout (this); + TQVBoxLayout *tqlayout = new TQVBoxLayout (this); listBox = new KListBox (this); 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(); @@ -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) { @@ -446,7 +446,7 @@ 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 () { @@ -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/phraselistitem.cpp b/kmouth/phraselistitem.cpp index 0574d2b..6e902f3 100644 --- a/kmouth/phraselistitem.cpp +++ b/kmouth/phraselistitem.cpp @@ -47,6 +47,6 @@ void PhraseListItem::paint (TQPainter *p) { if (drawCursor()) { TQRect r (0, 0, listBox()->maxItemWidth(), height (listBox())); listBox()->tqstyle().tqdrawPrimitive (TQStyle::PE_FocusRect, p, r, - listBox()->colorGroup()); + listBox()->tqcolorGroup()); } } diff --git a/kmouth/speech.cpp b/kmouth/speech.cpp index b682a47..81ed650 100644 --- a/kmouth/speech.cpp +++ b/kmouth/speech.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include @@ -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/texttospeechconfigurationwidget.cpp b/kmouth/texttospeechconfigurationwidget.cpp index cd4b6c7..f7fe16a 100644 --- a/kmouth/texttospeechconfigurationwidget.cpp +++ b/kmouth/texttospeechconfigurationwidget.cpp @@ -18,9 +18,9 @@ #include "texttospeechconfigurationwidget.h" #include -#include +#include #include -#include +#include #include #include #include diff --git a/kmouth/texttospeechsystem.cpp b/kmouth/texttospeechsystem.cpp index c8c32d3..f7f9515 100644 --- a/kmouth/texttospeechsystem.cpp +++ b/kmouth/texttospeechsystem.cpp @@ -18,7 +18,7 @@ #include "texttospeechsystem.h" #include -#include +#include #include #include diff --git a/kmouth/wordcompletion/creationsourcedetailsui.ui.h b/kmouth/wordcompletion/creationsourcedetailsui.ui.h index 12869aa..f3ed793 100644 --- a/kmouth/wordcompletion/creationsourcedetailsui.ui.h +++ b/kmouth/wordcompletion/creationsourcedetailsui.ui.h @@ -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()); + 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()); + 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 0efac9c..49af73d 100644 --- a/kmouth/wordcompletion/creationsourceui.ui +++ b/kmouth/wordcompletion/creationsourceui.ui @@ -120,7 +120,7 @@ Fixed - + 20 40 diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp index 957c89c..5108845 100644 --- a/kmouth/wordcompletion/dictionarycreationwizard.cpp +++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include +#include #include #include #include #include #include -#include +#include #include #include @@ -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)); @@ -283,10 +283,10 @@ MergeWidget::MergeWidget(KWizard *parent, const char *name, 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); diff --git a/kmouth/wordcompletion/klanguagebutton.cpp b/kmouth/wordcompletion/klanguagebutton.cpp index ffb6715..51d2066 100644 --- a/kmouth/wordcompletion/klanguagebutton.cpp +++ b/kmouth/wordcompletion/klanguagebutton.cpp @@ -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 ); } @@ -182,8 +182,8 @@ 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 ); }*/ diff --git a/kmouth/wordcompletion/klanguagebuttonhelper.cpp b/kmouth/wordcompletion/klanguagebuttonhelper.cpp index 91f2966..19bb721 100644 --- a/kmouth/wordcompletion/klanguagebuttonhelper.cpp +++ b/kmouth/wordcompletion/klanguagebuttonhelper.cpp @@ -31,18 +31,18 @@ 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 tdebase/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 ) @@ -52,9 +52,9 @@ void loadLanguageList(KLanguageButton *combo) 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()); + 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/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui index 03bccf7..5e8227e 100644 --- a/kmouth/wordcompletion/wordcompletionui.ui +++ b/kmouth/wordcompletion/wordcompletionui.ui @@ -18,7 +18,7 @@ - layout1 + tqlayout1 @@ -141,7 +141,7 @@ Expanding - + 20 240 @@ -152,7 +152,7 @@ - layout2 + tqlayout2 diff --git a/kmouth/wordcompletion/wordcompletionui.ui.h b/kmouth/wordcompletion/wordcompletionui.ui.h index 6ce5e75..d74137e 100644 --- a/kmouth/wordcompletion/wordcompletionui.ui.h +++ b/kmouth/wordcompletion/wordcompletionui.ui.h @@ -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()); + 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()); + 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 c68a967..2403faf 100644 --- a/kmouth/wordcompletion/wordcompletionwidget.cpp +++ b/kmouth/wordcompletion/wordcompletionwidget.cpp @@ -15,7 +15,7 @@ * * ***************************************************************************/ -#include +#include #include #include #include @@ -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); } @@ -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()); + 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(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()); + languageButton->insertLanguage(languageTag, i18n("without name"), TQString::tqfromLatin1("l10n/"), TQString()); } KListViewItem *item = new DictionaryListItem (dictionaryList, filename, wizard->name(), languageTag); @@ -251,8 +251,8 @@ void WordCompletionWidget::exportDictionary() { return; if (KIO::NetAccess::exists(url, false, this)) { - if (KMessageBox::warningContinueCancel(0,TQString("%1").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("%1").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/wordlist.cpp b/kmouth/wordcompletion/wordlist.cpp index 2e88852..11a15a1 100644 --- a/kmouth/wordcompletion/wordlist.cpp +++ b/kmouth/wordcompletion/wordlist.cpp @@ -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); - tqApp->processEvents (20); + tqApp->tqprocessEvents (20); } } return map; @@ -237,7 +237,7 @@ WordMap parseFiles (TQStringList files, TQTextStream::Encoding encoding, TQTextC WordMap mergeFiles (TQMap files, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Merging dictionaries...")); pdlg->show(); - tqApp->processEvents (20); + tqApp->tqprocessEvents (20); int progress = 0; int steps = files.count(); @@ -269,7 +269,7 @@ WordMap mergeFiles (TQMap files, KProgressDialog *pdlg) { if (steps != 0 && progress*100/steps > percent) { percent = progress*100/steps; pdlg->progressBar()->setProgress(percent); - tqApp->processEvents (20); + tqApp->tqprocessEvents (20); } } @@ -290,7 +290,7 @@ WordMap mergeFiles (TQMap files, KProgressDialog *pdlg) { WordMap parseKDEDoc (TQString language, KProgressDialog *pdlg) { pdlg->setLabel (i18n("Parsing the KDE documentation...")); pdlg->show(); - tqApp->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(); - tqApp->processEvents (20); + tqApp->tqprocessEvents (20); TQStringList files = filename; @@ -314,7 +314,7 @@ 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(); - tqApp->processEvents (20); + tqApp->tqprocessEvents (20); TQStringList directories; directories += directory; @@ -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); - tqApp->processEvents (20); + tqApp->tqprocessEvents (20); int progress = 0; int steps = 0; int percent = 0; @@ -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); - tqApp->processEvents (20); + tqApp->tqprocessEvents (20); } } } diff --git a/ksayit/Freeverb_plugin/freeverb_setup.ui b/ksayit/Freeverb_plugin/freeverb_setup.ui index 7cd1a02..6172a8e 100644 --- a/ksayit/Freeverb_plugin/freeverb_setup.ui +++ b/ksayit/Freeverb_plugin/freeverb_setup.ui @@ -20,7 +20,7 @@ 0 - + 360 300 @@ -38,7 +38,7 @@ - layout6 + tqlayout6 @@ -56,7 +56,7 @@ 0 - + 0 260 @@ -79,7 +79,7 @@ <b>Room</b> - + WordBreak|AlignCenter @@ -161,7 +161,7 @@ 0 - + 0 260 @@ -184,7 +184,7 @@ <b>Damp</b> - + WordBreak|AlignCenter @@ -260,7 +260,7 @@ 0 - + 0 260 @@ -283,7 +283,7 @@ <b>Wet</b> - + WordBreak|AlignCenter @@ -359,7 +359,7 @@ 0 - + 0 260 @@ -382,7 +382,7 @@ <b>Dry</b> - + WordBreak|AlignCenter @@ -458,7 +458,7 @@ 0 - + 0 260 @@ -481,7 +481,7 @@ <b>Width</b> - + WordBreak|AlignCenter @@ -571,7 +571,7 @@ - layout12 + tqlayout12 @@ -587,7 +587,7 @@ Expanding - + 180 20 @@ -598,7 +598,7 @@ OK_Button - + 60 0 diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp index 088d7d3..bb91885 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp @@ -11,7 +11,7 @@ // // QT includes -// #include +// #include #include // KDE includes diff --git a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui index 052ed1f..94f421a 100644 --- a/ksayit/KTTSD_Lib/KTTSDlibSetup.ui +++ b/ksayit/KTTSD_Lib/KTTSDlibSetup.ui @@ -51,7 +51,7 @@ - layout1 + tqlayout1 @@ -67,7 +67,7 @@ Expanding - + 40 20 @@ -95,7 +95,7 @@ Expanding - + 40 20 diff --git a/ksayit/KTTSD_Lib/kttsdlib.cpp b/ksayit/KTTSD_Lib/kttsdlib.cpp index 342e43c..707ebab 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.cpp +++ b/ksayit/KTTSD_Lib/kttsdlib.cpp @@ -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 d205b79..d0e902b 100644 --- a/ksayit/KTTSD_Lib/kttsdlib.h +++ b/ksayit/KTTSD_Lib/kttsdlib.h @@ -93,7 +93,7 @@ public: void sayText(); - int getStatus() const; + int gettqStatus() const; void stop(); diff --git a/ksayit/src/DocTreeView.ui b/ksayit/src/DocTreeView.ui index be3c4d6..1222c83 100644 --- a/ksayit/src/DocTreeView.ui +++ b/ksayit/src/DocTreeView.ui @@ -20,7 +20,7 @@ 0 - + 100 200 diff --git a/ksayit/src/KSayItView.ui b/ksayit/src/KSayItView.ui index 90d8332..a95a90e 100644 --- a/ksayit/src/KSayItView.ui +++ b/ksayit/src/KSayItView.ui @@ -23,7 +23,7 @@ TextEdit - + 400 200 diff --git a/ksayit/src/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp index 695c22e..60a7bde 100644 --- a/ksayit/src/docbookclasses.cpp +++ b/ksayit/src/docbookclasses.cpp @@ -11,7 +11,7 @@ // // TQt includes #include -#include +#include #include #include #include diff --git a/ksayit/src/docbookgenerator.h b/ksayit/src/docbookgenerator.h index 392c406..109d0c5 100644 --- a/ksayit/src/docbookgenerator.h +++ b/ksayit/src/docbookgenerator.h @@ -13,7 +13,7 @@ #define DOCBOOKGENERATOR_H // TQt includes -#include +#include // KDE includes diff --git a/ksayit/src/docbookparser.cpp b/ksayit/src/docbookparser.cpp index a48858e..8a5baa1 100644 --- a/ksayit/src/docbookparser.cpp +++ b/ksayit/src/docbookparser.cpp @@ -13,7 +13,7 @@ // TQt includes #include #include -#include +#include //KDE includes #include @@ -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 ); @@ -203,7 +203,7 @@ void DocbookParser::parseAuthor(const TQDomElement &element, ListViewInterface * 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,7 +473,7 @@ 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 ); diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp index 17e5dc0..98b76b1 100644 --- a/ksayit/src/doctreeviewimpl.cpp +++ b/ksayit/src/doctreeviewimpl.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -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); } @@ -779,7 +779,7 @@ void DocTreeViewImpl::slotDeleteItem() TQListViewItemIterator itr( m_rootItem ); while ( itr.current() ) { item = static_cast(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; } @@ -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 ); @@ -979,7 +979,7 @@ void DocTreeViewImpl::slotNewParagraph() // 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(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(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/fx_setup.ui b/ksayit/src/fx_setup.ui index 4e9e975..77f2cd9 100644 --- a/ksayit/src/fx_setup.ui +++ b/ksayit/src/fx_setup.ui @@ -24,7 +24,7 @@ - layout7 + tqlayout7 @@ -32,7 +32,7 @@ - layout3 + tqlayout3 @@ -50,7 +50,7 @@ listBox_Available - + 150 170 @@ -61,7 +61,7 @@ - layout4 + tqlayout4 @@ -77,7 +77,7 @@ Expanding - + 20 40 @@ -88,7 +88,7 @@ toolButton_add - + 30 32767 @@ -105,7 +105,7 @@ toolButton_remove - + 30 32767 @@ -128,7 +128,7 @@ Expanding - + 20 40 @@ -139,7 +139,7 @@ - layout5 + tqlayout5 @@ -157,7 +157,7 @@ listBox_Active - + 150 170 @@ -173,7 +173,7 @@ - layout8 + tqlayout8 @@ -189,7 +189,7 @@ Expanding - + 40 20 diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp index 101bd86..cefaba6 100644 --- a/ksayit/src/ksayit.cpp +++ b/ksayit/src/ksayit.cpp @@ -92,7 +92,7 @@ KSayItApp::KSayItApp(TQWidget* parent, const char* name, WFlags f, TQT_TQOBJECT(this), TQT_SLOT(slotPreferences()) ); // init Clipboard - cb = TQApplication::clipboard(); + cb = TQApplication::tqclipboard(); connect(cb, TQT_SIGNAL(dataChanged()), TQT_TQOBJECT(this), TQT_SLOT(slotClipboardChanged()) ); // create SystemTray object @@ -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 @@ -322,12 +322,12 @@ 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)), TQT_TQOBJECT(this), TQT_SLOT(slotEnableCopyCut(bool))); - connect( view, TQT_SIGNAL(signalShowStatus(const TQString &)), + connect( view, TQT_SIGNAL(signalShowtqStatus(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotStatusMsg(const TQString &))); connect( view, TQT_SIGNAL(signalSetCaption(const TQString &)), TQT_TQOBJECT(this), TQT_SLOT(slotSetCaption(const TQString &))); @@ -813,7 +813,7 @@ void KSayItApp::setActions(int actions) // 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; + kdDebug(100200) << TQString("KSayItApp:PSA: %1").tqarg(mask, 0, 2) << endl; // disable actions not supported by the plugin int ma = actions & mask; diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h index 56949ec..97d2c95 100644 --- a/ksayit/src/ksayit.h +++ b/ksayit/src/ksayit.h @@ -26,7 +26,7 @@ using namespace std; // include files for TQt #include -#include +#include // include files for KDE #include @@ -115,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(); diff --git a/ksayit/src/ksayitviewimpl.cpp b/ksayit/src/ksayitviewimpl.cpp index 5c1b697..e3eb5ee 100644 --- a/ksayit/src/ksayitviewimpl.cpp +++ b/ksayit/src/ksayitviewimpl.cpp @@ -21,7 +21,7 @@ using namespace std; // QT includes #include -#include +#include #include // KDE includes diff --git a/ksayit/src/ksayitviewimpl.h b/ksayit/src/ksayitviewimpl.h index 105c0f2..6128fe2 100644 --- a/ksayit/src/ksayitviewimpl.h +++ b/ksayit/src/ksayitviewimpl.h @@ -41,7 +41,7 @@ public: 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/saxhandler.cpp b/ksayit/src/saxhandler.cpp index e8035dc..7e2d6aa 100644 --- a/ksayit/src/saxhandler.cpp +++ b/ksayit/src/saxhandler.cpp @@ -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."); diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp index 7135dbd..298f32f 100644 --- a/ksayit/src/voicesetupdlg.cpp +++ b/ksayit/src/voicesetupdlg.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include // KDE includes @@ -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/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