Rename obsolete tq methods to standard names

7 files changed, 17 insertions, 17 deletions

diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp
index a32eb6e..1ff3817 100644
--- a/kmouth/optionsdialog.cpp
+++ b/kmouth/optionsdialog.cpp
@@ -125,11 +125,11 @@ OptionsDialog::OptionsDialog (TQWidget *parent)
    tabCtl = new TQTabWidget (pageGeneral, "general");
 
    behaviourWidget = new PreferencesWidget (tabCtl, "prefPage");
-   behaviourWidget->tqlayout()->setMargin(KDialog::marginHint());
+   behaviourWidget->layout()->setMargin(KDialog::marginHint());
    tabCtl->addTab (behaviourWidget, i18n("&Preferences"));
    
    commandWidget = new TextToSpeechConfigurationWidget (tabCtl, "ttsTab");
-   commandWidget->tqlayout()->setMargin(KDialog::marginHint());
+   commandWidget->layout()->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 6188a8a..ffa3ff2 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.tqunicode();
+      ushort uc = ch.unicode();
       TQCString number; number.setNum(uc);
       if ((uc>127) || (uc<32) || (ch=='<') || (ch=='>') || (ch=='&') || (ch==';'))
          res = res + "&#" + number + ";";
diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp
index 838d5ec..1c035e6 100644
--- a/kmouth/phrasebook/phrasebookdialog.cpp
+++ b/kmouth/phrasebook/phrasebookdialog.cpp
@@ -667,12 +667,12 @@ void PhraseBookDialog::slotCut () {
 void PhraseBookDialog::slotCopy () {
    PhraseBook book;
    treeView->fillBook (&book, true);
-   TQApplication::tqclipboard()->setData(new PhraseBookDrag(&book));
+   TQApplication::clipboard()->setData(new PhraseBookDrag(&book));
 }
 
 void PhraseBookDialog::slotPaste () {
    PhraseBook book;
-   if (PhraseBookDrag::decode(TQApplication::tqclipboard()->data(), &book)) {
+   if (PhraseBookDrag::decode(TQApplication::clipboard()->data(), &book)) {
       addBook (treeView->currentItem(), &book);
    }
 }
diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp
index ef4557e..7d447a2 100644
--- a/kmouth/phraselist.cpp
+++ b/kmouth/phraselist.cpp
@@ -48,16 +48,16 @@
 PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,name) {
    isInSlot = false;
    setBackgroundMode(PaletteBase);
-   TQVBoxLayout *tqlayout = new TQVBoxLayout (this);
+   TQVBoxLayout *layout = 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."));
-   tqlayout->addWidget(listBox);
+   layout->addWidget(listBox);
 
    TQHBoxLayout *rowLayout = new TQHBoxLayout ();
-   tqlayout->addLayout(rowLayout);
+   layout->addLayout(rowLayout);
 
    completion = new WordCompletion();
 
@@ -271,7 +271,7 @@ void PhraseList::cutListSelection () {
 }
 
 void PhraseList::copyListSelection () {
-   TQApplication::tqclipboard()->setText (getListSelection().join ("\n"));
+   TQApplication::clipboard()->setText (getListSelection().join ("\n"));
 }
 
 void PhraseList::lineEntered (const TQString &phrase) {
diff --git a/kmouth/phraselistitem.cpp b/kmouth/phraselistitem.cpp
index 0574d2b..10d29ae 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()->tqstyle().tqdrawPrimitive (TQStyle::PE_FocusRect, p, r,
+      listBox()->style().tqdrawPrimitive (TQStyle::PE_FocusRect, p, r,
                                         listBox()->colorGroup());
    }
 }
diff --git a/kmouth/wordcompletion/dictionarycreationwizard.cpp b/kmouth/wordcompletion/dictionarycreationwizard.cpp
index 6f777a0..0b8e18c 100644
--- a/kmouth/wordcompletion/dictionarycreationwizard.cpp
+++ b/kmouth/wordcompletion/dictionarycreationwizard.cpp
@@ -283,10 +283,10 @@ MergeWidget::MergeWidget(KWizard *parent, const char *name,
 
    TQWidget *contents = new TQWidget(viewport());
    addChild(contents);
-   TQGridLayout *tqlayout = new TQGridLayout (contents);
+   TQGridLayout *layout = new TQGridLayout (contents);
    setResizePolicy (TQScrollView::AutoOneFit);
-   tqlayout->setColStretch (0, 0);
-   tqlayout->setColStretch (1, 1);
+   layout->setColStretch (0, 0);
+   layout->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);
-      tqlayout->addWidget (checkbox, row, 0);
-      tqlayout->addWidget (numInput, row, 1);
+      layout->addWidget (checkbox, row, 0);
+      layout->addWidget (numInput, row, 1);
       
       checkbox->setChecked (true);
       numInput->setRange (1, 100, 10, true);
diff --git a/kmouth/wordcompletion/wordcompletionui.ui b/kmouth/wordcompletion/wordcompletionui.ui
index 7083045..03bccf7 100644
--- a/kmouth/wordcompletion/wordcompletionui.ui
+++ b/kmouth/wordcompletion/wordcompletionui.ui
@@ -18,7 +18,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="1">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -152,7 +152,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <vbox>
                 <property name="name">