From 2c01fd64ddde84a6d78b632f7f3b7c3560dc288c Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 73c08b592db45af554b9f21029bc549d70f683ab. --- kcontrol/arts/arts.cpp | 36 ++++++++++++++++++------------------ kcontrol/arts/generaltab.ui | 10 +++++----- kcontrol/arts/hardwaretab.ui | 8 ++++---- kcontrol/arts/krichtextlabel.cpp | 12 ++++++------ kcontrol/arts/krichtextlabel.h | 4 ++-- 5 files changed, 35 insertions(+), 35 deletions(-) (limited to 'kcontrol/arts') diff --git a/kcontrol/arts/arts.cpp b/kcontrol/arts/arts.cpp index f2a6ff265..ae65419a9 100644 --- a/kcontrol/arts/arts.cpp +++ b/kcontrol/arts/arts.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include @@ -297,7 +297,7 @@ void KArtsModule::load( bool useDefaults ) { if(a->name == audioIO) // first item: "autodetect" { - hardware->audioIO->setCurrentItem(audioIOList.at() + 1); + hardware->audioIO->setCurrentItem(audioIOList.tqat() + 1); break; } @@ -334,7 +334,7 @@ void KArtsModule::saveParams( void ) int item = hardware->audioIO->currentItem() - 1; // first item: "default" if (item >= 0) { - audioIO = audioIOList.at(item)->name; + audioIO = audioIOList.tqat(item)->name; } TQString dev = customDevice->isChecked() ? deviceName->text() : TQString::null; @@ -498,8 +498,8 @@ void KArtsModule::updateWidgets() int item = hardware->audioIO->currentItem() - 1; // first item: "default" if (item >= 0) { - audioIO = audioIOList.at(item)->name; - bool jack = (audioIO == TQString::fromLatin1("jack")); + audioIO = audioIOList.tqat(item)->name; + bool jack = (audioIO == TQString::tqfromLatin1("jack")); if(jack) { customRate->setChecked(false); @@ -620,39 +620,39 @@ TQString KArtsModule::createArgs(bool netTrans, TQString args; if(fragmentCount) - args += TQString::fromLatin1(" -F %1").arg(fragmentCount); + args += TQString::tqfromLatin1(" -F %1").arg(fragmentCount); if(fragmentSize) - args += TQString::fromLatin1(" -S %1").arg(fragmentSize); + args += TQString::tqfromLatin1(" -S %1").arg(fragmentSize); if (!audioIO.isEmpty()) - args += TQString::fromLatin1(" -a %1").arg(audioIO); + args += TQString::tqfromLatin1(" -a %1").arg(audioIO); if (duplex) - args += TQString::fromLatin1(" -d"); + args += TQString::tqfromLatin1(" -d"); if (netTrans) - args += TQString::fromLatin1(" -n"); + args += TQString::tqfromLatin1(" -n"); if (!deviceName.isEmpty()) - args += TQString::fromLatin1(" -D ") + deviceName; + args += TQString::tqfromLatin1(" -D ") + deviceName; if (rate) - args += TQString::fromLatin1(" -r %1").arg(rate); + args += TQString::tqfromLatin1(" -r %1").arg(rate); if (bits) - args += TQString::fromLatin1(" -b %1").arg(bits); + args += TQString::tqfromLatin1(" -b %1").arg(bits); if (autoSuspend && suspendTime) - args += TQString::fromLatin1(" -s %1").arg(suspendTime); + args += TQString::tqfromLatin1(" -s %1").arg(suspendTime); if (!addOptions.isEmpty()) args += TQChar(' ') + addOptions; - args += TQString::fromLatin1(" -m artsmessage"); - args += TQString::fromLatin1(" -c drkonqi"); - args += TQString::fromLatin1(" -l 3"); - args += TQString::fromLatin1(" -f"); + args += TQString::tqfromLatin1(" -m artsmessage"); + args += TQString::tqfromLatin1(" -c drkonqi"); + args += TQString::tqfromLatin1(" -l 3"); + args += TQString::tqfromLatin1(" -f"); return args; } diff --git a/kcontrol/arts/generaltab.ui b/kcontrol/arts/generaltab.ui index 06ccd7b92..f0d42dd8a 100644 --- a/kcontrol/arts/generaltab.ui +++ b/kcontrol/arts/generaltab.ui @@ -12,7 +12,7 @@ 613 - + 0 450 @@ -227,7 +227,7 @@ Recommended if you want sound. Expanding - + 173 20 @@ -256,7 +256,7 @@ Recommended if you want sound. Expanding - + 40 20 @@ -289,7 +289,7 @@ Recommended if you want sound. Expanding - + 40 20 @@ -308,7 +308,7 @@ Recommended if you want sound. Expanding - + 20 0 diff --git a/kcontrol/arts/hardwaretab.ui b/kcontrol/arts/hardwaretab.ui index ac20fdfe2..68ed5916f 100644 --- a/kcontrol/arts/hardwaretab.ui +++ b/kcontrol/arts/hardwaretab.ui @@ -133,7 +133,7 @@ Fixed - + 20 20 @@ -189,7 +189,7 @@ Expanding - + 0 20 @@ -252,7 +252,7 @@ Expanding - + 0 20 @@ -345,7 +345,7 @@ Expanding - + 20 60 diff --git a/kcontrol/arts/krichtextlabel.cpp b/kcontrol/arts/krichtextlabel.cpp index a08d8335d..d15d344a7 100644 --- a/kcontrol/arts/krichtextlabel.cpp +++ b/kcontrol/arts/krichtextlabel.cpp @@ -19,7 +19,7 @@ #include "krichtextlabel.h" #include -#include +#include #include #include @@ -41,14 +41,14 @@ static TQString qrichtextify( const TQString& text ) KRichTextLabel::KRichTextLabel( const TQString &text , TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); - setAlignment( TQt::WordBreak ); + tqsetAlignment( TQt::WordBreak ); setText(text); } KRichTextLabel::KRichTextLabel( TQWidget *parent, const char *name ) : TQLabel ( parent, name ) { m_defaultWidth = TQMIN(500, KGlobalSettings::desktopGeometry(this).width()*3/5); - setAlignment( TQt::WordBreak ); + tqsetAlignment( TQt::WordBreak ); } void KRichTextLabel::setDefaultWidth(int defaultWidth) @@ -62,7 +62,7 @@ TQSizePolicy KRichTextLabel::sizePolicy() const return TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Minimum, false); } -TQSize KRichTextLabel::minimumSizeHint() const +TQSize KRichTextLabel::tqminimumSizeHint() const { TQString qt_text = qrichtextify( text() ); int pref_width = 0; @@ -97,9 +97,9 @@ TQSize KRichTextLabel::minimumSizeHint() const return TQSize(pref_width, rt.height()); } -TQSize KRichTextLabel::sizeHint() const +TQSize KRichTextLabel::tqsizeHint() const { - return minimumSizeHint(); + return tqminimumSizeHint(); } void KRichTextLabel::setText( const TQString &text ) { diff --git a/kcontrol/arts/krichtextlabel.h b/kcontrol/arts/krichtextlabel.h index 18cba5a32..43bf0afce 100644 --- a/kcontrol/arts/krichtextlabel.h +++ b/kcontrol/arts/krichtextlabel.h @@ -45,8 +45,8 @@ public: int defaultWidth() const { return m_defaultWidth; } void setDefaultWidth(int defaultWidth); - virtual TQSize minimumSizeHint() const; - virtual TQSize sizeHint() const; + virtual TQSize tqminimumSizeHint() const; + virtual TQSize tqsizeHint() const; TQSizePolicy sizePolicy() const; public slots: -- cgit v1.2.3