From 6b45a7b7b2a804ccb2d522eb9ba6423fedb59b8f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:58:12 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit ca82971624269719d487c6f7980d7237f9420036. --- noatun-plugins/alarm/kminutespinbox.cpp | 2 +- noatun-plugins/alarm/wakeup.cpp | 16 ++++++++-------- noatun-plugins/alsaplayer/AlsaPlayer.ui | 10 +++++----- noatun-plugins/alsaplayer/configmodule.cpp | 8 ++++---- noatun-plugins/alsaplayer/userinterface.cpp | 8 ++++---- noatun-plugins/blurscope/scopedisplayer.cpp | 4 ++-- noatun-plugins/blurscope/sdlscope.h | 2 +- noatun-plugins/charlatan/configmodule.cpp | 8 ++++---- noatun-plugins/charlatan/userinterface.cpp | 4 ++-- noatun-plugins/dub/dub/dub.cpp | 4 ++-- noatun-plugins/dub/dub/dubconfigmodule.cpp | 2 +- noatun-plugins/dub/dub/dubprefs.ui | 2 +- noatun-plugins/dub/dub/fileselectorwidget.cpp | 8 ++++---- noatun-plugins/dub/dub/fileselectorwidget.h | 2 +- noatun-plugins/ffrs/ffrs.cpp | 20 ++++++++++---------- noatun-plugins/lyrics/cmodule.cpp | 24 ++++++++++++------------ noatun-plugins/lyrics/lyrics.cpp | 12 ++++++------ noatun-plugins/nexscope/gui.cpp | 2 +- noatun-plugins/nexscope/nex.cpp | 2 +- noatun-plugins/nexscope/nex.h | 6 +++--- noatun-plugins/nexscope/renderers.cpp | 2 +- noatun-plugins/oblique/cmodule.cpp | 10 +++++----- noatun-plugins/oblique/query.cpp | 4 ++-- noatun-plugins/oblique/tree.cpp | 24 ++++++++++++------------ noatun-plugins/oblique/tree.h | 2 +- noatun-plugins/oblique/view.cpp | 4 ++-- noatun-plugins/pitchablespeed/speedtuner.ui | 4 ++-- noatun-plugins/synaescope/cmodule.cpp | 10 +++++----- noatun-plugins/tippercanoe/synaescope.cpp | 2 +- noatun-plugins/wavecapture/wavecapture.h | 4 ++-- 30 files changed, 106 insertions(+), 106 deletions(-) (limited to 'noatun-plugins') diff --git a/noatun-plugins/alarm/kminutespinbox.cpp b/noatun-plugins/alarm/kminutespinbox.cpp index 72b6d9d..862eb0c 100644 --- a/noatun-plugins/alarm/kminutespinbox.cpp +++ b/noatun-plugins/alarm/kminutespinbox.cpp @@ -33,7 +33,7 @@ KMinuteSpinBox::KMinuteSpinBox(int _step, TQWidget *_parent, const char *_name) TQString KMinuteSpinBox::mapValueToText(int v) { if(v < 10) - return TQString("0%1").arg(v); + return TQString("0%1").tqarg(v); else return TQString::number(v); } diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp index f0602c3..6f5ff6c 100644 --- a/noatun-plugins/alarm/wakeup.cpp +++ b/noatun-plugins/alarm/wakeup.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -104,7 +104,7 @@ void Wakeup::slotCheckTime() TQDate d; t=TQTime::currentTime(); - d=TQDate::currentDate(); + d=TQDate::tqcurrentDate(); if (t.minute()!=minute[d.dayOfWeek()-1] || t.hour()!=hour[d.dayOfWeek()-1]) return; @@ -168,8 +168,8 @@ void Wakeup::slotVolumeChange() WakeupPrefs::WakeupPrefs( TQObject *parent ) : CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", parent ) { - TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQGridLayout *grid = new TQGridLayout (layout,8,4); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQGridLayout *grid = new TQGridLayout (tqlayout,8,4); monday=new TQCheckBox(i18n("Monday"),this); tuesday=new TQCheckBox(i18n("Tuesday"),this); @@ -209,7 +209,7 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) : applyall = new TQPushButton (this,"applyall"); applyall->setPixmap( BarIcon("down", KIcon::SizeSmall) ); - applyall->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, + applyall->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed, applyall->sizePolicy().hasHeightForWidth()) ); grid->addWidget (applyall,1,3,TQt::AlignLeft); @@ -248,9 +248,9 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) : TQLabel *volEndLabel = new TQLabel (i18n("Volume increases to:"), volFrame); volEndValue = new KPercentSpinBox (1 ,volFrame,"volendvalue"); - layout->addWidget(modeGroup); - layout->addWidget(volFrame); - layout->addStretch(); + tqlayout->addWidget(modeGroup); + tqlayout->addWidget(volFrame); + tqlayout->addStretch(); TQHBoxLayout *volLayout = new TQHBoxLayout(volFrame, KDialog::marginHint(), KDialog::spacingHint()); volLayout->addWidget(volEndLabel); diff --git a/noatun-plugins/alsaplayer/AlsaPlayer.ui b/noatun-plugins/alsaplayer/AlsaPlayer.ui index 3280242..73c4249 100644 --- a/noatun-plugins/alsaplayer/AlsaPlayer.ui +++ b/noatun-plugins/alsaplayer/AlsaPlayer.ui @@ -574,7 +574,7 @@ Speed: - + AlignVCenter|AlignRight @@ -1924,7 +1924,7 @@ Volume: - + AlignVCenter|AlignRight @@ -2205,7 +2205,7 @@ seeker - + 32 16 @@ -2254,7 +2254,7 @@ Expanding - + 20 20 @@ -2394,7 +2394,7 @@ Expanding - + 20 20 diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp index 664b1cb..0c98af7 100644 --- a/noatun-plugins/alsaplayer/configmodule.cpp +++ b/noatun-plugins/alsaplayer/configmodule.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include "configmodule.h" @@ -41,11 +41,11 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent) { scroll_ = new TQCheckBox(i18n("Scroll song title"), this); - TQVBoxLayout * layout = new TQVBoxLayout(this); + TQVBoxLayout * tqlayout = new TQVBoxLayout(this); - layout->addWidget(scroll_); + tqlayout->addWidget(scroll_); - layout->addStretch(100); + tqlayout->addStretch(100); reopen(); } diff --git a/noatun-plugins/alsaplayer/userinterface.cpp b/noatun-plugins/alsaplayer/userinterface.cpp index 55a63fe..cc53b06 100644 --- a/noatun-plugins/alsaplayer/userinterface.cpp +++ b/noatun-plugins/alsaplayer/userinterface.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include @@ -155,7 +155,7 @@ AlsaPlayer::AlsaPlayer() loadConfig(); - resize(sizeHint().width(), minimumSizeHint().height()); + resize(tqsizeHint().width(), tqminimumSizeHint().height()); show(); } @@ -273,7 +273,7 @@ void AlsaPlayer::slotConfigChanged() void AlsaPlayer::slotVolumeChanged(int i) { TQString text("%1%"); - volumeLabel->setText(text.arg(i)); + volumeLabel->setText(text.tqarg(i)); volumeSlider->setValue(i); } @@ -312,7 +312,7 @@ void AlsaPlayer::slotSetSpeed(int newSpeed) speed_ = newSpeed; pauseButton->setEnabled(0 != speed_); - speedLabel->setText(TQString("%1%").arg(speed_)); + speedLabel->setText(TQString("%1%").tqarg(speed_)); Arts::PlayObject playobject(napp->player()->engine()->playObject()); Arts::PitchablePlayObject pitchable = Arts::DynamicCast(playobject); diff --git a/noatun-plugins/blurscope/scopedisplayer.cpp b/noatun-plugins/blurscope/scopedisplayer.cpp index 42b375a..6b10732 100644 --- a/noatun-plugins/blurscope/scopedisplayer.cpp +++ b/noatun-plugins/blurscope/scopedisplayer.cpp @@ -130,7 +130,7 @@ SDLView::SDLView(int in) : mFd(in), outputBmp(0), fullscreen(false) d++; x++; } - repaint(); + tqrepaint(); } } @@ -233,7 +233,7 @@ void SDLView::checkInput() #define output2 ((unsigned char*)outputBmp.data) -void SDLView::repaint() +void SDLView::tqrepaint() { SDL_LockSurface(surface); TEST(); diff --git a/noatun-plugins/blurscope/sdlscope.h b/noatun-plugins/blurscope/sdlscope.h index 45c734c..73e6d6d 100644 --- a/noatun-plugins/blurscope/sdlscope.h +++ b/noatun-plugins/blurscope/sdlscope.h @@ -94,7 +94,7 @@ protected: void checkInput(); void setupPalette(double dummy=0.0); - void repaint(); + void tqrepaint(); private: int mFd; diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp index 2514ff6..0af4ddb 100644 --- a/noatun-plugins/charlatan/configmodule.cpp +++ b/noatun-plugins/charlatan/configmodule.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include "configmodule.h" #include "configmodule.moc" @@ -41,11 +41,11 @@ CharlatanConfigModule::CharlatanConfigModule(TQObject * parent) { scroll_ = new TQCheckBox(i18n("Scroll song title"), this); - TQVBoxLayout * layout = new TQVBoxLayout(this); + TQVBoxLayout * tqlayout = new TQVBoxLayout(this); - layout->addWidget(scroll_); + tqlayout->addWidget(scroll_); - layout->addStretch(100); + tqlayout->addStretch(100); reopen(); } diff --git a/noatun-plugins/charlatan/userinterface.cpp b/noatun-plugins/charlatan/userinterface.cpp index 2efc197..8e67516 100644 --- a/noatun-plugins/charlatan/userinterface.cpp +++ b/noatun-plugins/charlatan/userinterface.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -366,7 +366,7 @@ void Charlatan::slotConfigChanged() void Charlatan::slotVolumeChanged(int i) { - TQString message(i18n("Volume: %1").arg(i)); + TQString message(i18n("Volume: %1").tqarg(i)); showingVolumeTimer_->start(2000, true); titleLabel_->setText(message); diff --git a/noatun-plugins/dub/dub/dub.cpp b/noatun-plugins/dub/dub/dub.cpp index 5322ae6..046ba17 100644 --- a/noatun-plugins/dub/dub/dub.cpp +++ b/noatun-plugins/dub/dub/dub.cpp @@ -245,7 +245,7 @@ KFileItem* Dub::Linear_OneDir::first() if (first) set_file(&first_file, first); else { - if (first_file) { // invalidate first + if (first_file) { // tqinvalidate first delete first_file; first_file = 0; } @@ -451,7 +451,7 @@ void Dub::Recursive_Seq::prev_preorder() } else { TQString subdir = *top->current_subdir; - kdDebug(90010) << "we have children, pushing now " << subdir << endl; + kdDebug(90010) << "we have tqchildren, pushing now " << subdir << endl; push_dir(subdir, false); // push directory w/ backward iterators } } diff --git a/noatun-plugins/dub/dub/dubconfigmodule.cpp b/noatun-plugins/dub/dub/dubconfigmodule.cpp index 94b2c56..581bbf2 100644 --- a/noatun-plugins/dub/dub/dubconfigmodule.cpp +++ b/noatun-plugins/dub/dub/dubconfigmodule.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include "dubconfigmodule.h" diff --git a/noatun-plugins/dub/dub/dubprefs.ui b/noatun-plugins/dub/dub/dubprefs.ui index aa2725d..437dfa9 100644 --- a/noatun-plugins/dub/dub/dubprefs.ui +++ b/noatun-plugins/dub/dub/dubprefs.ui @@ -29,7 +29,7 @@ - layout1 + tqlayout1 diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp index 71bd497..c6d7d18 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.cpp +++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp @@ -14,7 +14,7 @@ * * ***************************************************************************/ -#include +#include #include #include #include @@ -40,7 +40,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent) : TQWidget(parent, "file selector widget") { - // widgets and layout + // widgets and tqlayout TQVBoxLayout* lo = new TQVBoxLayout(this); @@ -66,7 +66,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent) hlow->setMaximumHeight(up->height()); cmbPath = new KURLComboBox( KURLComboBox::Directories, true, this, "path combo" ); - cmbPath->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + cmbPath->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); KURLCompletion* cmpl = new KURLCompletion(); cmbPath->setCompletionObject( cmpl ); lo->addWidget(cmbPath); @@ -80,7 +80,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent) filterIcon = new TQLabel(filterBox); filterIcon->setPixmap( BarIcon("filter") ); filter = new KHistoryCombo(filterBox, "filter"); - filter->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); + filter->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed )); filterBox->setStretchFactor(filter, 2); lo->addWidget(filterBox); diff --git a/noatun-plugins/dub/dub/fileselectorwidget.h b/noatun-plugins/dub/dub/fileselectorwidget.h index 0832039..d140285 100644 --- a/noatun-plugins/dub/dub/fileselectorwidget.h +++ b/noatun-plugins/dub/dub/fileselectorwidget.h @@ -12,7 +12,7 @@ #ifndef _FILESELECTORWIDGET_H_ #define _FILESELECTORWIDGET_H_ -#include +#include #include #include #include diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp index 9119aa5..5bdad61 100644 --- a/noatun-plugins/ffrs/ffrs.cpp +++ b/noatun-plugins/ffrs/ffrs.cpp @@ -180,56 +180,56 @@ void FFRS::changed() #include #include -#include +#include #include #include FFRSPrefs::FFRSPrefs( TQObject *parent ) : CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",parent) { - TQVBoxLayout *layout = new TQVBoxLayout(this); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this); TQHBox *box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Width:"), box); mWidth = new KIntNumInput(width(), box); mWidth->setMinValue(0); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Height:"), box); mHeight = new KIntNumInput(height(), box); mHeight->setMinValue(0); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Visible block size:"), box); mFgblock = new KIntNumInput(fgblock(), box); mFgblock->setMinValue(0); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Transparent block size:"), box); mBgblock = new KIntNumInput(bgblock(), box); mBgblock->setMinValue(0); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Update interval:"), box); mRate = new KIntNumInput(rate(), box); mRate->setMinValue(0); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Foreground color:"), box); mFgcolor = new KColorButton(fgcolor(), box); box = new TQHBox(this); - layout->addWidget(box); + tqlayout->addWidget(box); new TQLabel(i18n("Background color:"), box); mBgcolor = new KColorButton(bgcolor(), box); - layout->addStretch(); + tqlayout->addStretch(); } void FFRSPrefs::save() diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp index e84bec3..6f2183f 100644 --- a/noatun-plugins/lyrics/cmodule.cpp +++ b/noatun-plugins/lyrics/cmodule.cpp @@ -1,6 +1,6 @@ #include "cmodule.h" #include "lyrics.h" -#include +#include #include #include #include @@ -47,23 +47,23 @@ const char *const DEFAULT_TQUERY = LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "document", _parent) { /* Thanks to the kde-usability guys for the help designing this dialog! * help to simon edwards of KGuardGod, for a big help designing it */ - TQVBoxLayout *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - TQHBoxLayout *hlayout = new TQHBoxLayout(vlayout, KDialog::spacingHint()); - vlayout->setStretchFactor( hlayout, 1 ); + TQVBoxLayout *vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); + TQHBoxLayout *htqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint()); + vtqlayout->setStretchFactor( htqlayout, 1 ); // Search box - TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() ); - boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) ); + TQVBoxLayout *boxtqlayout = new TQVBoxLayout( htqlayout, KDialog::spacingHint() ); + boxtqlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) ); providersBox = new KListBox( this, "providersBox" ); - boxlayout->addWidget(providersBox); + boxtqlayout->addWidget(providersBox); boxButtons = new KButtonBox( this,Qt::Vertical ); boxButtons->addButton( i18n( "New Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( newSearch() ) ); boxButtons->addButton( i18n( "Delete Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( delSearch() ) ); boxButtons->addButton( i18n( "Move Up" ), TQT_TQOBJECT(this), TQT_SLOT( moveUpSearch() ) ); boxButtons->addButton( i18n( "Move Down" ), TQT_TQOBJECT(this), TQT_SLOT( moveDownSearch() ) ); - boxButtons->layout(); - boxlayout->addWidget( boxButtons ); + boxButtons->tqlayout(); + boxtqlayout->addWidget( boxButtons ); // Edit box TQGroupBox *propBox = new TQVGroupBox( i18n("Search Provider Properties" ), this ); @@ -76,8 +76,8 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n(" /* ATTENTION to translators: * The property names can't be translated. This means that $(author) must be kept as $(author), $(title) as $(title), etc, or it won't work.*/ TQLabel *textLabel = new TQLabel(i18n("For your query, you can use any property of your multimedia item, just enclosing it with a $(property).\n\nSome common properties used are $(title), $(author) and $(album). For example, to search in Google for the author, title and track, just use:\nhttp://www.google.com/search?q=$(author)+$(title)+$(track)"), propBox, "textLabel"); - textLabel->setAlignment(TQt::WordBreak); - hlayout->addWidget( propBox, 1 ); + textLabel->tqsetAlignment(TQt::WordBreak); + htqlayout->addWidget( propBox, 1 ); /* Signal/slots */ nameEdit->setEnabled( false ); @@ -88,7 +88,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n(" - vlayout->addStretch(); + vtqlayout->addStretch(); reopen(); save(); } diff --git a/noatun-plugins/lyrics/lyrics.cpp b/noatun-plugins/lyrics/lyrics.cpp index 30d7703..cbf6b63 100644 --- a/noatun-plugins/lyrics/lyrics.cpp +++ b/noatun-plugins/lyrics/lyrics.cpp @@ -59,7 +59,7 @@ Lyrics::Lyrics() : KMainWindow(), Plugin(), active(false) connect( history, TQT_SIGNAL(uiChanged(int, bool)), this, TQT_SLOT(changeUI(int, bool)) ); connect( napp->player(), TQT_SIGNAL(newSong()), this, TQT_SLOT(newSong()) ); - /* Status bar */ + /* tqStatus bar */ statusBar()->insertItem(i18n("Ready"), 0, 1); statusBar()->setItemAlignment(0, TQt::AlignLeft); @@ -122,7 +122,7 @@ void Lyrics::loadedURL() if ( !napp->player()->current() ) return; statusBar()->changeItem(i18n("Loaded"), 0); - setCaption(i18n("Lyrics: %1").arg(napp->player()->current().property("title"))); + setCaption(i18n("Lyrics: %1").tqarg(napp->player()->current().property("title"))); if (!htmlpart->url().url().isEmpty() && napp->player()->current() && !napp->player()->current().property("Lyrics::URL").isEmpty()) { kdDebug(90020) << "Setting URL for (loaded)" << napp->player()->current().title() << endl; napp->player()->current().setProperty("Lyrics::URL", htmlpart->url().url()); @@ -196,7 +196,7 @@ void Lyrics::viewLyrics(int index) pos = props_regexp.search(url); } TQString title(napp->player()->current().property("title")); - setCaption(i18n("Loading Lyrics for %1").arg(title)); + setCaption(i18n("Loading Lyrics for %1").tqarg(title)); // Check if we have a music playing if (napp->player()->current()) { htmlpart->begin(); @@ -207,7 +207,7 @@ void Lyrics::viewLyrics(int index) "Title%1" "Author%2" "Album%3" - "").arg( napp->player()->current().property( "title" ) ).arg( napp->player()->current().property( "author" ) ).arg( napp->player()->current().property( "album" ) ) ); + "").tqarg( napp->player()->current().property( "title" ) ).tqarg( napp->player()->current().property( "author" ) ).tqarg( napp->player()->current().property( "album" ) ) ); KURL _url; /* Check if we should use the store url or the query one */ if (napp->player()->current().property("Lyrics::URL").isEmpty()) { @@ -218,7 +218,7 @@ void Lyrics::viewLyrics(int index) attach_act->setChecked(false); site_act->setEnabled(true); actionCollection()->action("search_label")->setEnabled(true); - htmlpart->write( i18n( "

Searching at %1
(%2)

" ).arg( name ).arg( _url.prettyURL() ).arg( _url.url() ) ); + htmlpart->write( i18n( "

Searching at %1
(%2)

" ).tqarg( name ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) ); } else { _url = napp->player()->current().property("Lyrics::URL"); _url.setQuery(_url.query().replace(TQRegExp("%20"), "+")); @@ -226,7 +226,7 @@ void Lyrics::viewLyrics(int index) attach_act->setChecked(true); site_act->setEnabled(false); actionCollection()->action("search_label")->setEnabled(false); - htmlpart->write( i18n( "

Using the stored URL
(%1)

" ).arg( _url.prettyURL() ).arg( _url.url() ) ); + htmlpart->write( i18n( "

Using the stored URL
(%1)

" ).tqarg( _url.prettyURL() ).tqarg( _url.url() ) ); } htmlpart->write( "" ); htmlpart->end(); diff --git a/noatun-plugins/nexscope/gui.cpp b/noatun-plugins/nexscope/gui.cpp index db0fcb3..624eb48 100644 --- a/noatun-plugins/nexscope/gui.cpp +++ b/noatun-plugins/nexscope/gui.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include #include #include diff --git a/noatun-plugins/nexscope/nex.cpp b/noatun-plugins/nexscope/nex.cpp index 3144782..76870ff 100644 --- a/noatun-plugins/nexscope/nex.cpp +++ b/noatun-plugins/nexscope/nex.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include #include diff --git a/noatun-plugins/nexscope/nex.h b/noatun-plugins/nexscope/nex.h index 3d16762..3a447f1 100644 --- a/noatun-plugins/nexscope/nex.h +++ b/noatun-plugins/nexscope/nex.h @@ -20,8 +20,8 @@ typedef uint8_t Byte; #define COLOR(r,g,b) ((r<<16) | (g<<8) | (b)) #define COLORSTR(pixel) \ - TQString("#%1%2%3").arg(TQString::number((pixel>>16) & 8, 16)) \ - .arg(TQString::number((pixel>>8) & 8, 16)).arg(TQString::number(pixel& 8, 16)) + TQString("#%1%2%3").tqarg(TQString::number((pixel>>16) & 8, 16)) \ + .tqarg(TQString::number((pixel>>8) & 8, 16)).tqarg(TQString::number(pixel& 8, 16)) #define STRCOLOR(pixel) \ Pixel(((pixel.mid(1,2).toInt(0, 16)) <<16) \ @@ -79,7 +79,7 @@ Q_OBJECT public: Spacer(TQWidget *parent) : TQWidget(parent) { - setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, + tqsetSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding)); } }; diff --git a/noatun-plugins/nexscope/renderers.cpp b/noatun-plugins/nexscope/renderers.cpp index ff3d1c4..538fa43 100644 --- a/noatun-plugins/nexscope/renderers.cpp +++ b/noatun-plugins/nexscope/renderers.cpp @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include structQt::HorizontalPair : public Renderer diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp index f4ac917..a43f0a2 100644 --- a/noatun-plugins/oblique/cmodule.cpp +++ b/noatun-plugins/oblique/cmodule.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include @@ -36,9 +36,9 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) mRegexpEditor=0; { - TQVBoxLayout *layout = new TQVBoxLayout(this, 11, 7); - layout->setAutoAdd(true); - layout->setSpacing(7); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 11, 7); + tqlayout->setAutoAdd(true); + tqlayout->setSpacing(7); } @@ -159,7 +159,7 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique) connect(mOptionPlayable, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); mOptionChildrenVisible = new TQCheckBox(i18n("&Children visible"), groupbox); - TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes children become direct children of this node's parent")); + TQWhatsThis::add(mOptionChildrenVisible, i18n("Don't create this node, this nodes tqchildren become direct tqchildren of this node's parent")); connect(mOptionChildrenVisible, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCurrent())); mOptionAutoOpen = new TQCheckBox(i18n("Auto &open"), groupbox); diff --git a/noatun-plugins/oblique/query.cpp b/noatun-plugins/oblique/query.cpp index 34ebe72..d53437e 100644 --- a/noatun-plugins/oblique/query.cpp +++ b/noatun-plugins/oblique/query.cpp @@ -487,7 +487,7 @@ void Query::loadGroup(TQDomElement element, QueryGroup *parent) group->setOption(QueryGroup::Playable, true); else if (e.tagName().lower() == "playable") group->setOption(QueryGroup::Playable, true); - else if (e.tagName().lower() == "childrenvisible") + else if (e.tagName().lower() == "tqchildrenvisible") group->setOption(QueryGroup::ChildrenVisible, true); else if (e.tagName().lower() == "autoopen") group->setOption(QueryGroup::AutoOpen, true); @@ -534,7 +534,7 @@ void Query::saveGroup(TQDomElement &parent, QueryGroup *group) if (group->option(QueryGroup::Playable)) childe.appendChild(doc.createElement("playable")); if (group->option(QueryGroup::ChildrenVisible)) - childe.appendChild(doc.createElement("childrenvisible")); + childe.appendChild(doc.createElement("tqchildrenvisible")); if (group->option(QueryGroup::AutoOpen)) childe.appendChild(doc.createElement("autoopen")); } diff --git a/noatun-plugins/oblique/tree.cpp b/noatun-plugins/oblique/tree.cpp index 0087b99..7f3415c 100644 --- a/noatun-plugins/oblique/tree.cpp +++ b/noatun-plugins/oblique/tree.cpp @@ -180,7 +180,7 @@ TreeItem::~TreeItem() tree()->mPlayableItemCount--; } - // I have to remove my children, because they need their parent + // I have to remove my tqchildren, because they need their parent // in tact for the below code while (TreeItem *c = firstChild()) delete c; @@ -750,36 +750,36 @@ TreeItem *Tree::collate(TreeItem *fix, QueryGroup *group, const File &file, Tree TreeItem *Tree::node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf) { - // search childOf's immediate children - TreeItem *children; + // search childOf's immediate tqchildren + TreeItem *tqchildren; if (childOf) - children = childOf->firstChild(); + tqchildren = childOf->firstChild(); else - children = firstChild(); + tqchildren = firstChild(); TQString presentation = group->presentation(file); - while (children) + while (tqchildren) { // merging would be done here bool matches=false; if (group->fuzzyness(QueryGroup::Case)) { - matches = (children->text(0).lower() == presentation.lower()); + matches = (tqchildren->text(0).lower() == presentation.lower()); } else { - matches = (children->text(0) == presentation); + matches = (tqchildren->text(0) == presentation); } - matches = matches && !children->group()->option(QueryGroup::Playable); + matches = matches && !tqchildren->group()->option(QueryGroup::Playable); if (matches) { - children->setFile(File()); - return children; + tqchildren->setFile(File()); + return tqchildren; } - children = children->nextSibling(); + tqchildren = tqchildren->nextSibling(); } TreeItem *item; diff --git a/noatun-plugins/oblique/tree.h b/noatun-plugins/oblique/tree.h index 4e5ca83..c8e545e 100644 --- a/noatun-plugins/oblique/tree.h +++ b/noatun-plugins/oblique/tree.h @@ -182,7 +182,7 @@ private: TreeItem *node(TreeItem *fix, QueryGroup *group, const File &file, TreeItem *childOf); /** - * remove the siblings and children of the treeitem + * remove the siblings and tqchildren of the treeitem **/ void remove(TreeItem *, const File &file); diff --git a/noatun-plugins/oblique/view.cpp b/noatun-plugins/oblique/view.cpp index 073873c..5f32b4d 100644 --- a/noatun-plugins/oblique/view.cpp +++ b/noatun-plugins/oblique/view.cpp @@ -74,7 +74,7 @@ View::View(Oblique *oblique) { TQLabel *l = new TQLabel(i18n("&Jump:"), 0, "kde toolbar widget"); l->setBackgroundMode( TQt::PaletteButton ); - l->setAlignment( + l->tqsetAlignment( (TQApplication::reverseLayout() ? TQt::AlignRight : TQt::AlignLeft) | TQt::AlignVCenter | TQt::ShowPrefix ); @@ -138,7 +138,7 @@ View::~View() int slice = tree->slice()->id(); TQString query = tree->fileOfQuery(); - TQString t = TQString("%1:%2").arg(slice).arg(query); + TQString t = TQString("%1:%2").tqarg(slice).tqarg(query); tabids.append(t); } diff --git a/noatun-plugins/pitchablespeed/speedtuner.ui b/noatun-plugins/pitchablespeed/speedtuner.ui index 68cdbe9..c200860 100644 --- a/noatun-plugins/pitchablespeed/speedtuner.ui +++ b/noatun-plugins/pitchablespeed/speedtuner.ui @@ -68,7 +68,7 @@ false - + AlignHCenter @@ -84,7 +84,7 @@ Expanding - + 20 20 diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp index 78f41e6..e6c2930 100644 --- a/noatun-plugins/synaescope/cmodule.cpp +++ b/noatun-plugins/synaescope/cmodule.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include @@ -37,7 +37,7 @@ SynaePrefs::SynaePrefs(TQObject *parent) xRes = new TQSpinBox(320, 1024, 16, this); yRes = new TQSpinBox(240, 768, 12, this); - TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); + TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint()); TQHBoxLayout *xResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint()); TQHBoxLayout *yResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint()); @@ -47,9 +47,9 @@ SynaePrefs::SynaePrefs(TQObject *parent) yResLayout->addWidget(new TQLabel(i18n("Display height:"), this)); yResLayout->addWidget(yRes); - layout->addLayout(xResLayout); - layout->addLayout(yResLayout); - layout->addStretch(); + tqlayout->addLayout(xResLayout); + tqlayout->addLayout(yResLayout); + tqlayout->addStretch(); changed=false; connect(xRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges())); diff --git a/noatun-plugins/tippercanoe/synaescope.cpp b/noatun-plugins/tippercanoe/synaescope.cpp index 9a0fb1b..b33b71d 100644 --- a/noatun-plugins/tippercanoe/synaescope.cpp +++ b/noatun-plugins/tippercanoe/synaescope.cpp @@ -81,7 +81,7 @@ void SynaeScope::scopeEvent(float *left, float *right, int size) void SynaeScope::read(KProcess *, char *buf, int) { - TQString num = TQString::fromLatin1(buf); + TQString num = TQString::tqfromLatin1(buf); num = num.left(num.find(TQRegExp("\\s"))); id = num.toInt(); embed->embed(id); diff --git a/noatun-plugins/wavecapture/wavecapture.h b/noatun-plugins/wavecapture/wavecapture.h index b1d459d..78cbc5f 100644 --- a/noatun-plugins/wavecapture/wavecapture.h +++ b/noatun-plugins/wavecapture/wavecapture.h @@ -56,8 +56,8 @@ private: int pluginMenuItem; bool _enabled; - enum Status { PAUSED, STOPPED, PLAYING }; - Status _status; + enum tqStatus { PAUSED, STOPPED, PLAYING }; + tqStatus _status; Arts::Effect_WAVECAPTURE _capture; int _count; -- cgit v1.2.1